Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Cleanup effort in prep for GA push:

Trim trailing whitespace... no func change



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174748 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
commit 7d838a5bf6e627d6f6a06e630338610cfea1a895 1 parent cdd5ed7
Jim Jagielski authored September 23, 2011

Showing 64 changed files with 528 additions and 528 deletions. Show diff stats Hide diff stats

  1. 14  include/ap_config.h
  2. 12  include/ap_hooks.h
  3. 12  include/ap_listen.h
  4. 16  include/ap_mpm.h
  5. 4  include/ap_regex.h
  6. 62  include/ap_regkey.h
  7. 6  include/ap_release.h
  8. 2  include/ap_slotmem.h
  9. 20  include/ap_socache.h
  10. 14  include/http_connection.h
  11. 34  include/http_core.h
  12. 82  include/http_log.h
  13. 74  include/http_protocol.h
  14. 16  include/http_request.h
  15. 14  include/http_vhost.h
  16. 160  include/httpd.h
  17. 2  include/mod_core.h
  18. 16  include/mpm_common.h
  19. 10  include/scoreboard.h
  20. 6  include/util_cfgtree.h
  21. 4  include/util_charset.h
  22. 50  include/util_filter.h
  23. 20  include/util_ldap.h
  24. 4  include/util_mutex.h
  25. 26  include/util_script.h
  26. 6  include/util_time.h
  27. 2  modules/aaa/mod_authz_dbd.h
  28. 2  modules/arch/unix/mod_unixd.h
  29. 38  modules/arch/win32/mod_isapi.h
  30. 10  modules/cache/cache_cache.h
  31. 8  modules/cache/cache_hash.h
  32. 6  modules/cache/cache_pqueue.h
  33. 2  modules/core/mod_so.h
  34. 10  modules/core/mod_watchdog.h
  35. 4  modules/database/mod_dbd.h
  36. 16  modules/filters/libsed.h
  37. 4  modules/filters/mod_include.h
  38. 2  modules/filters/mod_ratelimit.h
  39. 18  modules/filters/regexp.h
  40. 16  modules/filters/sed.h
  41. 8  modules/generators/mod_cgi.h
  42. 2  modules/generators/mod_suexec.h
  43. 16  modules/ldap/util_ldap_cache.h
  44. 14  modules/loggers/mod_log_config.h
  45. 6  modules/lua/lua_vmprep.h
  46. 4  modules/lua/mod_lua.h
  47. 2  modules/mappers/mod_rewrite.h
  48. 64  modules/proxy/ajp.h
  49. 26  modules/proxy/ajp_header.h
  50. 6  modules/proxy/mod_serf.h
  51. 2  modules/session/mod_session.h
  52. 4  modules/ssl/mod_ssl.h
  53. 20  modules/ssl/ssl_private.h
  54. 2  modules/ssl/ssl_util_ssl.h
  55. 2  os/netware/os.h
  56. 4  os/netware/pre_nw.h
  57. 6  os/unix/unixd.h
  58. 6  os/win32/os.h
  59. 2  server/mpm/event/fdqueue.h
  60. 2  server/mpm/mpmt_os2/mpm_default.h
  61. 2  server/mpm/simple/simple_event.h
  62. 10  server/mpm/winnt/mpm_winnt.h
  63. 10  server/util_expr_parse.h
  64. 12  support/suexec.h
14  include/ap_config.h
@@ -25,8 +25,8 @@
25 25
 #include "ap_hooks.h"
26 26
 
27 27
 /* Although this file doesn't declare any hooks, declare the exports group here */
28  
-/** 
29  
- * @defgroup exports Apache exports 
  28
+/**
  29
+ * @defgroup exports Apache exports
30 30
  * @ingroup  APACHE_CORE
31 31
  */
32 32
 
@@ -40,8 +40,8 @@
40 40
  * @see AP_DECLARE_EXPORT
41 41
  *
42 42
  * AP_DECLARE_STATIC and AP_DECLARE_EXPORT are left undefined when
43  
- * including Apache's Core headers, to import and link the symbols from the 
44  
- * dynamic Apache Core library and assure appropriate indirection and calling 
  43
+ * including Apache's Core headers, to import and link the symbols from the
  44
+ * dynamic Apache Core library and assure appropriate indirection and calling
45 45
  * conventions at compile time.
46 46
  */
47 47
 # define AP_DECLARE_STATIC
@@ -67,7 +67,7 @@
67 67
 #define AP_DECLARE(type)            type
68 68
 
69 69
 /**
70  
- * Apache Core dso variable argument and hook functions are declared with 
  70
+ * Apache Core dso variable argument and hook functions are declared with
71 71
  * AP_DECLARE_NONSTD(), as they must use the C language calling convention.
72 72
  * @see AP_DECLARE
73 73
  * @code
@@ -106,7 +106,7 @@
106 106
 /**
107 107
  * Declare a dso module's exported module structure as AP_MODULE_DECLARE_DATA.
108 108
  *
109  
- * Unless AP_MODULE_DECLARE_STATIC is defined at compile time, symbols 
  109
+ * Unless AP_MODULE_DECLARE_STATIC is defined at compile time, symbols
110 110
  * declared with AP_MODULE_DECLARE_DATA are always exported.
111 111
  * @code
112 112
  * module AP_MODULE_DECLARE_DATA mod_tag
@@ -124,7 +124,7 @@
124 124
  * AP_MODULE_DECLARE_EXPORT is a no-op.  Unless contradicted by the
125 125
  * AP_MODULE_DECLARE_STATIC compile-time symbol, it is assumed and defined.
126 126
  *
127  
- * The old SHARED_MODULE compile-time symbol is now the default behavior, 
  127
+ * The old SHARED_MODULE compile-time symbol is now the default behavior,
128 128
  * so it is no longer referenced anywhere with Apache 2.0.
129 129
  */
130 130
 #define AP_MODULE_DECLARE_EXPORT
12  include/ap_hooks.h
@@ -23,8 +23,8 @@
23 23
 #define AP_HOOKS_H
24 24
 
25 25
 /* Although this file doesn't declare any hooks, declare the hook group here */
26  
-/** 
27  
- * @defgroup hooks Apache Hooks 
  26
+/**
  27
+ * @defgroup hooks Apache Hooks
28 28
  * @ingroup  APACHE_CORE
29 29
  */
30 30
 
@@ -50,8 +50,8 @@
50 50
  * @see AP_DECLARE_EXPORT
51 51
  *
52 52
  * AP_DECLARE_STATIC and AP_DECLARE_EXPORT are left undefined when
53  
- * including Apache's Core headers, to import and link the symbols from the 
54  
- * dynamic Apache Core library and assure appropriate indirection and calling 
  53
+ * including Apache's Core headers, to import and link the symbols from the
  54
+ * dynamic Apache Core library and assure appropriate indirection and calling
55 55
  * conventions at compile time.
56 56
  */
57 57
 # define AP_DECLARE_STATIC
@@ -119,8 +119,8 @@
119 119
                                             args_use,ok,decline)
120 120
 
121 121
 /**
122  
- * Implement a hook that runs until a function returns something other than 
123  
- * decline. If all functions return decline, the hook runner returns decline. 
  122
+ * Implement a hook that runs until a function returns something other than
  123
+ * decline. If all functions return decline, the hook runner returns decline.
124 124
  * The implementation is called ap_run_<i>name</i>.
125 125
  *
126 126
  * @param ret The return type of the hook (and the hook runner)
12  include/ap_listen.h
@@ -39,7 +39,7 @@ typedef struct ap_listen_rec ap_listen_rec;
39 39
 typedef apr_status_t (*accept_function)(void **csd, ap_listen_rec *lr, apr_pool_t *ptrans);
40 40
 
41 41
 /**
42  
- * @brief Apache's listeners record.  
  42
+ * @brief Apache's listeners record.
43 43
  *
44 44
  * These are used in the Multi-Processing Modules
45 45
  * to setup all of the sockets for the MPM to listen to and accept on.
@@ -50,7 +50,7 @@ struct ap_listen_rec {
50 50
      */
51 51
     ap_listen_rec *next;
52 52
     /**
53  
-     * The actual socket 
  53
+     * The actual socket
54 54
      */
55 55
     apr_socket_t *sd;
56 56
     /**
@@ -62,7 +62,7 @@ struct ap_listen_rec {
62 62
      */
63 63
     accept_function accept_func;
64 64
     /**
65  
-     * Is this socket currently active 
  65
+     * Is this socket currently active
66 66
      */
67 67
     int active;
68 68
     /**
@@ -88,7 +88,7 @@ AP_DECLARE(void) ap_listen_pre_config(void);
88 88
  * sockets.  This executes the listen and bind on the sockets.
89 89
  * @param s The global server_rec
90 90
  * @return The number of open sockets.
91  
- */ 
  91
+ */
92 92
 AP_DECLARE(int) ap_setup_listeners(server_rec *s);
93 93
 
94 94
 /**
@@ -107,9 +107,9 @@ AP_DECLARE_NONSTD(int) ap_close_selected_listeners(ap_slave_t *);
107 107
  * should not ever be called by external modules.  ALL MPMs should include
108 108
  * LISTEN_COMMANDS in their command_rec table so that these functions are
109 109
  * called.
110  
- */ 
  110
+ */
111 111
 AP_DECLARE_NONSTD(const char *) ap_set_listenbacklog(cmd_parms *cmd, void *dummy, const char *arg);
112  
-AP_DECLARE_NONSTD(const char *) ap_set_listener(cmd_parms *cmd, void *dummy, 
  112
+AP_DECLARE_NONSTD(const char *) ap_set_listener(cmd_parms *cmd, void *dummy,
113 113
                                                 int argc, char *const argv[]);
114 114
 AP_DECLARE_NONSTD(const char *) ap_set_send_buffer_size(cmd_parms *cmd, void *dummy,
115 115
 				    const char *arg);
16  include/ap_mpm.h
@@ -44,7 +44,7 @@ extern "C" {
44 44
 
45 45
     The MPM may or may not be multithreaded.  In the event that it is
46 46
     multithreaded, at any instant it guarantees a 1:1 mapping of threads
47  
-    ap_process_connection invocations.  
  47
+    ap_process_connection invocations.
48 48
 
49 49
     Note: In the future it will be possible for ap_process_connection
50 50
     to return to the MPM prior to finishing the entire connection; and
@@ -95,22 +95,22 @@ AP_DECLARE_HOOK(int, mpm, (apr_pool_t *pconf, apr_pool_t *plog, server_rec *serv
95 95
  * Spawn a process with privileges that another module has requested
96 96
  * @param r The request_rec of the current request
97 97
  * @param newproc The resulting process handle.
98  
- * @param progname The program to run 
99  
- * @param args the arguments to pass to the new program.  The first 
  98
+ * @param progname The program to run
  99
+ * @param args the arguments to pass to the new program.  The first
100 100
  *                   one should be the program name.
101  
- * @param env The new environment apr_table_t for the new process.  This 
  101
+ * @param env The new environment apr_table_t for the new process.  This
102 102
  *            should be a list of NULL-terminated strings.
103 103
  * @param attr the procattr we should use to determine how to create the new
104 104
  *         process
105  
- * @param p The pool to use. 
  105
+ * @param p The pool to use.
106 106
  */
107 107
 AP_DECLARE(apr_status_t) ap_os_create_privileged_process(
108 108
     const request_rec *r,
109  
-    apr_proc_t *newproc, 
  109
+    apr_proc_t *newproc,
110 110
     const char *progname,
111  
-    const char * const *args, 
  111
+    const char * const *args,
112 112
     const char * const *env,
113  
-    apr_procattr_t *attr, 
  113
+    apr_procattr_t *attr,
114 114
     apr_pool_t *p);
115 115
 
116 116
 /* Subtypes/Values for AP_MPMQ_IS_THREADED and AP_MPMQ_IS_FORKED        */
4  include/ap_regex.h
@@ -119,7 +119,7 @@ AP_DECLARE(int) ap_regcomp(ap_regex_t *preg, const char *regex, int cflags);
119 119
  * @param eflags Bitwise OR of AP_REG_* flags (NOTBOL and NOTEOL supported,
120 120
  *                                             other flags are ignored)
121 121
  * @return 0 for successful match, \p AP_REG_NOMATCH otherwise
122  
- */ 
  122
+ */
123 123
 AP_DECLARE(int) ap_regexec(const ap_regex_t *preg, const char *string,
124 124
                            apr_size_t nmatch, ap_regmatch_t *pmatch, int eflags);
125 125
 
@@ -146,7 +146,7 @@ AP_DECLARE(int) ap_regexec_len(const ap_regex_t *preg, const char *buff,
146 146
  * @param errbuf A buffer to store the error in
147 147
  * @param errbuf_size The size of the buffer
148 148
  */
149  
-AP_DECLARE(apr_size_t) ap_regerror(int errcode, const ap_regex_t *preg, 
  149
+AP_DECLARE(apr_size_t) ap_regerror(int errcode, const ap_regex_t *preg,
150 150
                                    char *errbuf, apr_size_t errbuf_size);
151 151
 
152 152
 /** Destroy a pre-compiled regex.
62  include/ap_regkey.h
@@ -34,7 +34,7 @@ extern "C" {
34 34
 
35 35
 typedef struct ap_regkey_t ap_regkey_t;
36 36
 
37  
-/* Used to recover AP_REGKEY_* constants 
  37
+/* Used to recover AP_REGKEY_* constants
38 38
  */
39 39
 AP_DECLARE(const ap_regkey_t *) ap_regkey_const(int i);
40 40
 
@@ -64,8 +64,8 @@ AP_DECLARE(const ap_regkey_t *) ap_regkey_const(int i);
64 64
  *           AP_REGKEY_CURRENT_USER
65 65
  *           AP_REGKEY_LOCAL_MACHINE
66 66
  *           AP_REGKEY_USERS
67  
- *           AP_REGKEY_PERFORMANCE_DATA 
68  
- *           AP_REGKEY_DYN_DATA 
  67
+ *           AP_REGKEY_PERFORMANCE_DATA
  68
+ *           AP_REGKEY_DYN_DATA
69 69
  * </PRE>
70 70
  * @param keyname The path of the key relative to the parent key
71 71
  * @param flags Or'ed value of:
@@ -77,10 +77,10 @@ AP_DECLARE(const ap_regkey_t *) ap_regkey_const(int i);
77 77
  * </PRE>
78 78
  * @param pool The pool in which newkey is allocated
79 79
  */
80  
-AP_DECLARE(apr_status_t) ap_regkey_open(ap_regkey_t **newkey, 
  80
+AP_DECLARE(apr_status_t) ap_regkey_open(ap_regkey_t **newkey,
81 81
                                         const ap_regkey_t *parentkey,
82 82
                                         const char *keyname,
83  
-                                        apr_int32_t flags, 
  83
+                                        apr_int32_t flags,
84 84
                                         apr_pool_t *pool);
85 85
 
86 86
 /**
@@ -98,22 +98,22 @@ AP_DECLARE(apr_status_t) ap_regkey_close(ap_regkey_t *key);
98 98
  *           AP_REGKEY_CURRENT_USER
99 99
  *           AP_REGKEY_LOCAL_MACHINE
100 100
  *           AP_REGKEY_USERS
101  
- *           AP_REGKEY_PERFORMANCE_DATA 
102  
- *           AP_REGKEY_DYN_DATA 
  101
+ *           AP_REGKEY_PERFORMANCE_DATA
  102
+ *           AP_REGKEY_DYN_DATA
103 103
  * </PRE>
104 104
  * @param keyname The path of the key relative to the parent key
105 105
  * @param pool The pool used for temp allocations
106 106
  * @remark ap_regkey_remove() is not recursive, although it removes
107  
- * all values within the given keyname, it will not remove a key 
  107
+ * all values within the given keyname, it will not remove a key
108 108
  * containing subkeys.
109 109
  */
110  
-AP_DECLARE(apr_status_t) ap_regkey_remove(const ap_regkey_t *parent, 
  110
+AP_DECLARE(apr_status_t) ap_regkey_remove(const ap_regkey_t *parent,
111 111
                                           const char *keyname,
112 112
                                           apr_pool_t *pool);
113 113
 
114 114
 /**
115 115
  * Win32 Only: Retrieve a registry value string from an open key.
116  
- * @param result The string value retrieved 
  116
+ * @param result The string value retrieved
117 117
  * @param key The registry key to retrieve the value from
118 118
  * @param valuename The named value to retrieve (pass "" for the default)
119 119
  * @param pool The pool used to store the result
@@ -121,9 +121,9 @@ AP_DECLARE(apr_status_t) ap_regkey_remove(const ap_regkey_t *parent,
121 121
  * if the registry value is set with AP_REG_EXPAND (REG_EXPAND_SZ), such
122 122
  * expansions are always performed.
123 123
  */
124  
-AP_DECLARE(apr_status_t) ap_regkey_value_get(char **result, 
125  
-                                             ap_regkey_t *key, 
126  
-                                             const char *valuename, 
  124
+AP_DECLARE(apr_status_t) ap_regkey_value_get(char **result,
  125
+                                             ap_regkey_t *key,
  126
+                                             const char *valuename,
127 127
                                              apr_pool_t *pool);
128 128
 
129 129
 /**
@@ -135,26 +135,26 @@ AP_DECLARE(apr_status_t) ap_regkey_value_get(char **result,
135 135
  * values will find all %foo% variables expanded from the environment.
136 136
  * @param pool The pool used for temp allocations
137 137
  */
138  
-AP_DECLARE(apr_status_t) ap_regkey_value_set(ap_regkey_t *key, 
139  
-                                             const char *valuename, 
140  
-                                             const char *value, 
  138
+AP_DECLARE(apr_status_t) ap_regkey_value_set(ap_regkey_t *key,
  139
+                                             const char *valuename,
  140
+                                             const char *value,
141 141
                                              apr_int32_t flags,
142 142
                                              apr_pool_t *pool);
143 143
 
144 144
 /**
145 145
  * Win32 Only: Retrieve a raw byte value from an open key.
146  
- * @param result The raw bytes value retrieved 
147  
- * @param resultsize Pointer to a variable to store the number raw bytes retrieved 
  146
+ * @param result The raw bytes value retrieved
  147
+ * @param resultsize Pointer to a variable to store the number raw bytes retrieved
148 148
  * @param resulttype Pointer to a variable to store the registry type of the value retrieved
149 149
  * @param key The registry key to retrieve the value from
150 150
  * @param valuename The named value to retrieve (pass "" for the default)
151 151
  * @param pool The pool used to store the result
152 152
  */
153  
-AP_DECLARE(apr_status_t) ap_regkey_value_raw_get(void **result, 
  153
+AP_DECLARE(apr_status_t) ap_regkey_value_raw_get(void **result,
154 154
                                                  apr_size_t *resultsize,
155 155
                                                  apr_int32_t *resulttype,
156  
-                                                 ap_regkey_t *key, 
157  
-                                                 const char *valuename, 
  156
+                                                 ap_regkey_t *key,
  157
+                                                 const char *valuename,
158 158
                                                  apr_pool_t *pool);
159 159
 
160 160
 /**
@@ -163,13 +163,13 @@ AP_DECLARE(apr_status_t) ap_regkey_value_raw_get(void **result,
163 163
  * @param valuename The named value to store (pass "" for the default)
164 164
  * @param value The bytes to store for the named value
165 165
  * @param valuesize The number of bytes for value
166  
- * @param valuetype The 
  166
+ * @param valuetype The
167 167
  * values will find all %foo% variables expanded from the environment.
168 168
  * @param pool The pool used for temp allocations
169 169
  */
170  
-AP_DECLARE(apr_status_t) ap_regkey_value_raw_set(ap_regkey_t *key, 
171  
-                                                 const char *valuename, 
172  
-                                                 const void *value, 
  170
+AP_DECLARE(apr_status_t) ap_regkey_value_raw_set(ap_regkey_t *key,
  171
+                                                 const char *valuename,
  172
+                                                 const void *value,
173 173
                                                  apr_size_t  valuesize,
174 174
                                                  apr_int32_t valuetype,
175 175
                                                  apr_pool_t *pool);
@@ -181,9 +181,9 @@ AP_DECLARE(apr_status_t) ap_regkey_value_raw_set(ap_regkey_t *key,
181 181
  * @param valuename The named value to retrieve (pass "" for the default)
182 182
  * @param pool The pool used to store the result
183 183
  */
184  
-AP_DECLARE(apr_status_t) ap_regkey_value_array_get(apr_array_header_t **result, 
  184
+AP_DECLARE(apr_status_t) ap_regkey_value_array_get(apr_array_header_t **result,
185 185
                                                    ap_regkey_t *key,
186  
-                                                   const char *valuename, 
  186
+                                                   const char *valuename,
187 187
                                                    apr_pool_t *pool);
188 188
 
189 189
 /**
@@ -194,9 +194,9 @@ AP_DECLARE(apr_status_t) ap_regkey_value_array_get(apr_array_header_t **result,
194 194
  * @param elts The number of elements in the elts string array
195 195
  * @param pool The pool used for temp allocations
196 196
  */
197  
-AP_DECLARE(apr_status_t) ap_regkey_value_array_set(ap_regkey_t *key, 
198  
-                                                   const char *valuename, 
199  
-                                                   int nelts, 
  197
+AP_DECLARE(apr_status_t) ap_regkey_value_array_set(ap_regkey_t *key,
  198
+                                                   const char *valuename,
  199
+                                                   int nelts,
200 200
                                                    const char * const * elts,
201 201
                                                    apr_pool_t *pool);
202 202
 
@@ -206,7 +206,7 @@ AP_DECLARE(apr_status_t) ap_regkey_value_array_set(ap_regkey_t *key,
206 206
  * @param valuename The named value to remove (pass "" for the default)
207 207
  * @param pool The pool used for temp allocations
208 208
  */
209  
-AP_DECLARE(apr_status_t) ap_regkey_value_remove(const ap_regkey_t *key, 
  209
+AP_DECLARE(apr_status_t) ap_regkey_value_remove(const ap_regkey_t *key,
210 210
                                                 const char *valuename,
211 211
                                                 apr_pool_t *pool);
212 212
 
6  include/ap_release.h
@@ -34,10 +34,10 @@
34 34
  * The tokens are listed in order of their significance for identifying the
35 35
  * application.
36 36
  *
37  
- * "Product tokens should be short and to the point -- use of them for 
  37
+ * "Product tokens should be short and to the point -- use of them for
38 38
  * advertizing or other non-essential information is explicitly forbidden."
39 39
  *
40  
- * Example: "Apache/1.1.0 MrWidget/0.1-alpha" 
  40
+ * Example: "Apache/1.1.0 MrWidget/0.1-alpha"
41 41
  */
42 42
 #define AP_SERVER_BASEVENDOR "Apache Software Foundation"
43 43
 #define AP_SERVER_BASEPROJECT "Apache HTTP Server"
@@ -48,7 +48,7 @@
48 48
 #define AP_SERVER_PATCHLEVEL_NUMBER   15
49 49
 #define AP_SERVER_DEVBUILD_BOOLEAN    1
50 50
 
51  
-/* Synchronize the above with docs/manual/style/version.ent */ 
  51
+/* Synchronize the above with docs/manual/style/version.ent */
52 52
 
53 53
 #if AP_SERVER_DEVBUILD_BOOLEAN
54 54
 #define AP_SERVER_ADD_STRING          "-dev"
2  include/ap_slotmem.h
@@ -148,7 +148,7 @@ struct ap_slotmem_provider_t {
148 148
     /**
149 149
      * return number of free (not used) slots allocated for this entry.
150 150
      * Valid for slots which are AP_SLOTMEM_TYPE_PREGRAB as well as
151  
-     * any which use get/release. 
  151
+     * any which use get/release.
152 152
      * @param s ap_slotmem_instance_t to use.
153 153
      * @return number of slots
154 154
      */
20  include/ap_socache.h
@@ -24,7 +24,7 @@
24 24
  */
25 25
 
26 26
 #ifndef AP_SOCACHE_H
27  
-#define AP_SOCACHE_H 
  27
+#define AP_SOCACHE_H
28 28
 
29 29
 #include "httpd.h"
30 30
 #include "ap_provider.h"
@@ -93,7 +93,7 @@ typedef struct ap_socache_provider_t {
93 93
     /** Bitmask of AP_SOCACHE_FLAG_* flags: */
94 94
     unsigned int flags;
95 95
 
96  
-    /** 
  96
+    /**
97 97
      * Create a session cache based on the given configuration string.
98 98
      * The instance pointer returned in the instance paramater will be
99 99
      * passed as the first argument to subsequent invocations.
@@ -102,11 +102,11 @@ typedef struct ap_socache_provider_t {
102 102
      * @param arg Used-specified configuration string.  May be NULL to
103 103
      *        force use of defaults.
104 104
      * @param tmp Pool to be used for any temporary allocations
105  
-     * @param p Pool to be use for any allocations lasting as long as 
  105
+     * @param p Pool to be use for any allocations lasting as long as
106 106
      * the created instance
107 107
      * @return NULL on success, or an error string on failure.
108 108
      */
109  
-    const char *(*create)(ap_socache_instance_t **instance, const char *arg, 
  109
+    const char *(*create)(ap_socache_instance_t **instance, const char *arg,
110 110
                           apr_pool_t *tmp, apr_pool_t *p);
111 111
 
112 112
     /* Initialize the cache.  The cname must be of maximum length 16
@@ -124,18 +124,18 @@ typedef struct ap_socache_provider_t {
124 124
      * @param pool Pool for long-lived allocations
125 125
      * @return APR status value indicating success.
126 126
      */
127  
-    apr_status_t (*init)(ap_socache_instance_t *instance, const char *cname, 
  127
+    apr_status_t (*init)(ap_socache_instance_t *instance, const char *cname,
128 128
                          const struct ap_socache_hints *hints,
129 129
                          server_rec *s, apr_pool_t *pool);
130 130
 
131  
-    /** 
  131
+    /**
132 132
      * Destroy a given cache instance object.
133 133
      * @param instance The cache instance to destroy.
134 134
      * @param s Associated server structure (for logging purposes)
135 135
      */
136 136
     void (*destroy)(ap_socache_instance_t *instance, server_rec *s);
137 137
 
138  
-    /** 
  138
+    /**
139 139
      * Store an object in a cache instance.
140 140
      * @param instance The cache instance
141 141
      * @param s Associated server structure (for logging purposes)
@@ -147,9 +147,9 @@ typedef struct ap_socache_provider_t {
147 147
      * @param pool Pool for temporary allocations.
148 148
      * @return APR status value.
149 149
      */
150  
-    apr_status_t (*store)(ap_socache_instance_t *instance, server_rec *s, 
151  
-                          const unsigned char *id, unsigned int idlen, 
152  
-                          apr_time_t expiry, 
  150
+    apr_status_t (*store)(ap_socache_instance_t *instance, server_rec *s,
  151
+                          const unsigned char *id, unsigned int idlen,
  152
+                          apr_time_t expiry,
153 153
                           unsigned char *data, unsigned int datalen,
154 154
                           apr_pool_t *pool);
155 155
 
14  include/http_connection.h
@@ -41,7 +41,7 @@ extern "C" {
41 41
  * This is the protocol module driver.  This calls all of the
42 42
  * pre-connection and connection hooks for all protocol modules.
43 43
  * @param c The connection on which the request is read
44  
- * @param csd The mechanism on which this connection is to be read.  
  44
+ * @param csd The mechanism on which this connection is to be read.
45 45
  *            Most times this will be a socket, but it is up to the module
46 46
  *            that accepts the request to determine the exact type.
47 47
  */
@@ -74,15 +74,15 @@ AP_DECLARE(int) ap_start_lingering_close(conn_rec *c);
74 74
 
75 75
 /* Hooks */
76 76
 /**
77  
- * create_connection is a RUN_FIRST hook which allows modules to create 
78  
- * connections. In general, you should not install filters with the 
79  
- * create_connection hook. If you require vhost configuration information 
  77
+ * create_connection is a RUN_FIRST hook which allows modules to create
  78
+ * connections. In general, you should not install filters with the
  79
+ * create_connection hook. If you require vhost configuration information
80 80
  * to make filter installation decisions, you must use the pre_connection
81 81
  * or install_network_transport hook. This hook should close the connection
82 82
  * if it encounters a fatal error condition.
83 83
  *
84 84
  * @param p The pool from which to allocate the connection record
85  
- * @param server The server record to create the connection too. 
  85
+ * @param server The server record to create the connection too.
86 86
  * @param csd The socket that has been accepted
87 87
  * @param conn_id A unique identifier for this connection.  The ID only
88 88
  *                needs to be unique at that time, not forever.
@@ -93,13 +93,13 @@ AP_DECLARE(int) ap_start_lingering_close(conn_rec *c);
93 93
 AP_DECLARE_HOOK(conn_rec *, create_connection,
94 94
                 (apr_pool_t *p, server_rec *server, apr_socket_t *csd,
95 95
                  long conn_id, void *sbh, apr_bucket_alloc_t *alloc))
96  
-   
  96
+
97 97
 /**
98 98
  * This hook gives protocol modules an opportunity to set everything up
99 99
  * before calling the protocol handler.  All pre-connection hooks are
100 100
  * run until one returns something other than ok or decline
101 101
  * @param c The connection on which the request has been received.
102  
- * @param csd The mechanism on which this connection is to be read.  
  102
+ * @param csd The mechanism on which this connection is to be read.
103 103
  *            Most times this will be a socket, but it is up to the module
104 104
  *            that accepts the request to determine the exact type.
105 105
  * @return OK or DECLINED
34  include/http_core.h
@@ -88,7 +88,7 @@ extern "C" {
88 88
 /** @} */
89 89
 
90 90
 /**
91  
- * @defgroup get_remote_host Remote Host Resolution 
  91
+ * @defgroup get_remote_host Remote Host Resolution
92 92
  * @ingroup APACHE_CORE_HTTPD
93 93
  * @{
94 94
  */
@@ -152,7 +152,7 @@ AP_DECLARE(int) ap_allow_overrides(request_rec *r);
152 152
 /**
153 153
  * Retrieve the document root for this server
154 154
  * @param r The current request
155  
- * @warning Don't use this!  If your request went through a Userdir, or 
  155
+ * @warning Don't use this!  If your request went through a Userdir, or
156 156
  * something like that, it'll screw you.  But it's back-compatible...
157 157
  * @return The document root
158 158
  */
@@ -175,10 +175,10 @@ AP_DECLARE(const char *) ap_document_root(request_rec *r);
175 175
  *                     never forced.
176 176
  *     REMOTE_DOUBLE_REV will always force a DNS lookup, and also force
177 177
  *                   a double reverse lookup, regardless of the HostnameLookups
178  
- *                   setting.  The result is the (double reverse checked) 
  178
+ *                   setting.  The result is the (double reverse checked)
179 179
  *                   hostname, or NULL if any of the lookups fail.
180 180
  * </pre>
181  
- * @param str_is_ip unless NULL is passed, this will be set to non-zero on output when an IP address 
  181
+ * @param str_is_ip unless NULL is passed, this will be set to non-zero on output when an IP address
182 182
  *        string is returned
183 183
  * @return The remote hostname
184 184
  */
@@ -228,7 +228,7 @@ AP_DECLARE(const char *) ap_get_server_name_for_url(request_rec *r);
228 228
 AP_DECLARE(apr_port_t) ap_get_server_port(const request_rec *r);
229 229
 
230 230
 /**
231  
- * Return the limit on bytes in request msg body 
  231
+ * Return the limit on bytes in request msg body
232 232
  * @param r The current request
233 233
  * @return the maximum number of bytes in the request msg body
234 234
  */
@@ -276,8 +276,8 @@ AP_DECLARE_NONSTD(int) ap_core_translate(request_rec *r);
276 276
 /** @see require_line */
277 277
 typedef struct require_line require_line;
278 278
 
279  
-/** 
280  
- * @brief A structure to keep track of authorization requirements 
  279
+/**
  280
+ * @brief A structure to keep track of authorization requirements
281 281
 */
282 282
 struct require_line {
283 283
     /** Where the require line is in the config file. */
@@ -285,7 +285,7 @@ struct require_line {
285 285
     /** The complete string from the command line */
286 286
     char *requirement;
287 287
 };
288  
-     
  288
+
289 289
 /**
290 290
  * Return the type of authorization required for this request
291 291
  * @param r The current request
@@ -298,7 +298,7 @@ AP_DECLARE(const char *) ap_auth_type(request_rec *r);
298 298
  * @param r The current request
299 299
  * @return The current authorization realm
300 300
  */
301  
-AP_DECLARE(const char *) ap_auth_name(request_rec *r);     
  301
+AP_DECLARE(const char *) ap_auth_name(request_rec *r);
302 302
 
303 303
 /**
304 304
  * How the requires lines must be met.
@@ -355,10 +355,10 @@ AP_DECLARE(apr_socket_t *) ap_get_conn_socket(conn_rec *c);
355 355
 #endif
356 356
 
357 357
 /**
358  
- * @brief  Per-request configuration 
  358
+ * @brief  Per-request configuration
359 359
 */
360 360
 typedef struct {
361  
-    /** bucket brigade used by getline for look-ahead and 
  361
+    /** bucket brigade used by getline for look-ahead and
362 362
      * ap_get_client_block for holding left-over request body */
363 363
     struct apr_bucket_brigade *bb;
364 364
 
@@ -474,8 +474,8 @@ typedef enum {
474 474
     srv_sig_withmail
475 475
 } server_signature_e;
476 476
 
477  
-/** 
478  
- * @brief Per-directory configuration 
  477
+/**
  478
+ * @brief Per-directory configuration
479 479
  */
480 480
 typedef struct {
481 481
     /** path of the directory/regex/etc. see also d_is_fnmatch/absolute below */
@@ -495,13 +495,13 @@ typedef struct {
495 495
     allow_options_t opts_remove;
496 496
     overrides_t override;
497 497
     allow_options_t override_opts;
498  
-    
  498
+
499 499
     /* Custom response config. These can contain text or a URL to redirect to.
500 500
      * if response_code_strings is NULL then there are none in the config,
501 501
      * if it's not null then it's allocated to sizeof(char*)*RESPONSE_CODES.
502 502
      * This lets us do quick merges in merge_core_dir_configs().
503 503
      */
504  
-  
  504
+
505 505
     char **response_code_strings; /* from ErrorDocument, not from
506 506
                                    * ap_custom_response() */
507 507
 
@@ -625,7 +625,7 @@ typedef struct {
625 625
 /* Per-server core configuration */
626 626
 
627 627
 typedef struct {
628  
-  
  628
+
629 629
     char *gprof_dir;
630 630
 
631 631
     /* Name translations --- we want the core to be able to do *something*
@@ -633,7 +633,7 @@ typedef struct {
633 633
      * can be tested that way).  But let's keep it to the bare minimum:
634 634
      */
635 635
     const char *ap_document_root;
636  
-  
  636
+
637 637
     /* Access control */
638 638
 
639 639
     char *access_name;
82  include/http_log.h
@@ -88,21 +88,21 @@ extern "C" {
88 88
 #define APLOG_NOERRNO		(APLOG_LEVELMASK + 1)
89 89
 
90 90
 /** Use APLOG_TOCLIENT on ap_log_rerror() to give content
91  
- * handlers the option of including the error text in the 
  91
+ * handlers the option of including the error text in the
92 92
  * ErrorDocument sent back to the client. Setting APLOG_TOCLIENT
93  
- * will cause the error text to be saved in the request_rec->notes 
  93
+ * will cause the error text to be saved in the request_rec->notes
94 94
  * table, keyed to the string "error-notes", if and only if:
95 95
  * - the severity level of the message is APLOG_WARNING or greater
96 96
  * - there are no other "error-notes" set in request_rec->notes
97 97
  * Once error-notes is set, it is up to the content handler to
98 98
  * determine whether this text should be sent back to the client.
99  
- * Note: Client generated text streams sent back to the client MUST 
  99
+ * Note: Client generated text streams sent back to the client MUST
100 100
  * be escaped to prevent CSS attacks.
101 101
  */
102 102
 #define APLOG_TOCLIENT          ((APLOG_LEVELMASK + 1) * 2)
103 103
 
104 104
 /* normal but significant condition on startup, usually printed to stderr */
105  
-#define APLOG_STARTUP           ((APLOG_LEVELMASK + 1) * 4) 
  105
+#define APLOG_STARTUP           ((APLOG_LEVELMASK + 1) * 4)
106 106
 
107 107
 #ifndef DEFAULT_LOGLEVEL
108 108
 #define DEFAULT_LOGLEVEL	APLOG_WARNING
@@ -285,7 +285,7 @@ AP_DECLARE(void) ap_open_stderr_log(apr_pool_t *p);
285 285
  * @param p The pool to allocate out of
286 286
  * @param file Name of the file to log stderr output
287 287
  */
288  
-AP_DECLARE(apr_status_t) ap_replace_stderr_log(apr_pool_t *p, 
  288
+AP_DECLARE(apr_status_t) ap_replace_stderr_log(apr_pool_t *p,
289 289
                                                const char *file);
290 290
 
291 291
 /**
@@ -295,9 +295,9 @@ AP_DECLARE(apr_status_t) ap_replace_stderr_log(apr_pool_t *p,
295 295
  * @param ptemp Pool used for temporary allocations
296 296
  * @param s_main The main server
297 297
  * @note ap_open_logs isn't expected to be used by modules, it is
298  
- * an internal core function 
  298
+ * an internal core function
299 299
  */
300  
-int ap_open_logs(apr_pool_t *pconf, apr_pool_t *plog, 
  300
+int ap_open_logs(apr_pool_t *pconf, apr_pool_t *plog,
301 301
                  apr_pool_t *ptemp, server_rec *s_main);
302 302
 
303 303
 /**
@@ -310,13 +310,13 @@ int ap_open_logs(apr_pool_t *pconf, apr_pool_t *plog,
310 310
  */
311 311
 void ap_logs_child_init(apr_pool_t *p, server_rec *s);
312 312
 
313  
-/* 
  313
+/*
314 314
  * The primary logging functions, ap_log_error, ap_log_rerror, ap_log_cerror,
315  
- * and ap_log_perror use a printf style format string to build the log message.  
316  
- * It is VERY IMPORTANT that you not include any raw data from the network, 
317  
- * such as the request-URI or request header fields, within the format 
318  
- * string.  Doing so makes the server vulnerable to a denial-of-service 
319  
- * attack and other messy behavior.  Instead, use a simple format string 
  315
+ * and ap_log_perror use a printf style format string to build the log message.
  316
+ * It is VERY IMPORTANT that you not include any raw data from the network,
  317
+ * such as the request-URI or request header fields, within the format
  318
+ * string.  Doing so makes the server vulnerable to a denial-of-service
  319
+ * attack and other messy behavior.  Instead, use a simple format string
320 320
  * like "%s", followed by the string containing the untrusted data.
321 321
  */
322 322
 
@@ -338,11 +338,11 @@ void ap_logs_child_init(apr_pool_t *p, server_rec *s);
338 338
  * in preference to calling this function.  Otherwise, if a conn_rec is
339 339
  * available, use that with ap_log_cerror() in preference to calling
340 340
  * this function.
341  
- * @warning It is VERY IMPORTANT that you not include any raw data from 
342  
- * the network, such as the request-URI or request header fields, within 
343  
- * the format string.  Doing so makes the server vulnerable to a 
344  
- * denial-of-service attack and other messy behavior.  Instead, use a 
345  
- * simple format string like "%s", followed by the string containing the 
  341
+ * @warning It is VERY IMPORTANT that you not include any raw data from
  342
+ * the network, such as the request-URI or request header fields, within
  343
+ * the format string.  Doing so makes the server vulnerable to a
  344
+ * denial-of-service attack and other messy behavior.  Instead, use a
  345
+ * simple format string like "%s", followed by the string containing the
346 346
  * untrusted data.
347 347
  */
348 348
 #ifdef DOXYGEN
@@ -381,11 +381,11 @@ AP_DECLARE(void) ap_log_error_(const char *file, int line, int module_index,
381 381
  * @param ... The arguments to use to fill out fmt.
382 382
  * @note ap_log_perror is implemented as a macro
383 383
  * @note Use APLOG_MARK to fill out file, line, and module_index
384  
- * @warning It is VERY IMPORTANT that you not include any raw data from 
385  
- * the network, such as the request-URI or request header fields, within 
386  
- * the format string.  Doing so makes the server vulnerable to a 
387  
- * denial-of-service attack and other messy behavior.  Instead, use a 
388  
- * simple format string like "%s", followed by the string containing the 
  384
+ * @warning It is VERY IMPORTANT that you not include any raw data from
  385
+ * the network, such as the request-URI or request header fields, within
  386
+ * the format string.  Doing so makes the server vulnerable to a
  387
+ * denial-of-service attack and other messy behavior.  Instead, use a
  388
+ * simple format string like "%s", followed by the string containing the
389 389
  * untrusted data.
390 390
  */
391 391
 #ifdef DOXYGEN
@@ -423,11 +423,11 @@ AP_DECLARE(void) ap_log_perror_(const char *file, int line, int module_index,
423 423
  * @param ... The arguments to use to fill out fmt.
424 424
  * @note ap_log_rerror is implemented as a macro
425 425
  * @note Use APLOG_MARK to fill out file, line, and module_index
426  
- * @warning It is VERY IMPORTANT that you not include any raw data from 
427  
- * the network, such as the request-URI or request header fields, within 
428  
- * the format string.  Doing so makes the server vulnerable to a 
429  
- * denial-of-service attack and other messy behavior.  Instead, use a 
430  
- * simple format string like "%s", followed by the string containing the 
  426
+ * @warning It is VERY IMPORTANT that you not include any raw data from
  427
+ * the network, such as the request-URI or request header fields, within
  428
+ * the format string.  Doing so makes the server vulnerable to a
  429
+ * denial-of-service attack and other messy behavior.  Instead, use a
  430
+ * simple format string like "%s", followed by the string containing the
431 431
  * untrusted data.
432 432
  */
433 433
 #ifdef DOXYGEN
@@ -467,11 +467,11 @@ AP_DECLARE(void) ap_log_rerror_(const char *file, int line, int module_index,
467 467
  * @note Use APLOG_MARK to fill out file, line, and module_index
468 468
  * @note If a request_rec is available, use that with ap_log_rerror()
469 469
  * in preference to calling this function.
470  
- * @warning It is VERY IMPORTANT that you not include any raw data from 
471  
- * the network, such as the request-URI or request header fields, within 
472  
- * the format string.  Doing so makes the server vulnerable to a 
473  
- * denial-of-service attack and other messy behavior.  Instead, use a 
474  
- * simple format string like "%s", followed by the string containing the 
  470
+ * @warning It is VERY IMPORTANT that you not include any raw data from
  471
+ * the network, such as the request-URI or request header fields, within
  472
+ * the format string.  Doing so makes the server vulnerable to a
  473
+ * denial-of-service attack and other messy behavior.  Instead, use a
  474
+ * simple format string like "%s", followed by the string containing the
475 475
  * untrusted data.
476 476
  */
477 477
 #ifdef DOXYGEN
@@ -513,11 +513,11 @@ AP_DECLARE(void) ap_log_cerror_(const char *file, int line, int module_index,
513 513
  * @note If a request_rec is available, use that with ap_log_rerror()
514 514
  * in preference to calling this function. This function is mainly useful for
515 515
  * modules like mod_ssl to use before the request_rec is created.
516  
- * @warning It is VERY IMPORTANT that you not include any raw data from 
517  
- * the network, such as the request-URI or request header fields, within 
518  
- * the format string.  Doing so makes the server vulnerable to a 
519  
- * denial-of-service attack and other messy behavior.  Instead, use a 
520  
- * simple format string like "%s", followed by the string containing the 
  516
+ * @warning It is VERY IMPORTANT that you not include any raw data from
  517
+ * the network, such as the request-URI or request header fields, within
  518
+ * the format string.  Doing so makes the server vulnerable to a
  519
+ * denial-of-service attack and other messy behavior.  Instead, use a
  520
+ * simple format string like "%s", followed by the string containing the
521 521
  * untrusted data.
522 522
  */
523 523
 #ifdef DOXYGEN
@@ -588,7 +588,7 @@ typedef struct piped_log piped_log;
588 588
  * @param p The pool to allocate out of
589 589
  * @param program The program to run in the logging process
590 590
  * @return The piped log structure
591  
- * @note The log program is invoked as @p APR_PROGRAM_ENV, 
  591
+ * @note The log program is invoked as @p APR_PROGRAM_ENV,
592 592
  *      @see ap_open_piped_log_ex to modify this behavior
593 593
  */
594 594
 AP_DECLARE(piped_log *) ap_open_piped_log(apr_pool_t *p, const char *program);
@@ -625,7 +625,7 @@ AP_DECLARE(apr_file_t *) ap_piped_log_read_fd(piped_log *pl);
625 625
 AP_DECLARE(apr_file_t *) ap_piped_log_write_fd(piped_log *pl);
626 626
 
627 627
 /**
628  
- * hook method to log error messages 
  628
+ * hook method to log error messages
629 629
  * @ingroup hooks
630 630
  * @param file The file in which this function is called
631 631
  * @param line The line number on which this function is called
@@ -635,7 +635,7 @@ AP_DECLARE(apr_file_t *) ap_piped_log_write_fd(piped_log *pl);
635 635
  * @param s The server which we are logging for
636 636
  * @param r The request which we are logging for
637 637
  * @param pool Memory pool to allocate from
638  
- * @param errstr message to log 
  638
+ * @param errstr message to log
639 639
  */
640 640
 AP_DECLARE_HOOK(void, error_log, (const char *file, int line,
641 641
                        int module_index, int level,
74  include/http_protocol.h
@@ -57,7 +57,7 @@ AP_DECLARE_DATA extern ap_filter_rec_t *ap_old_write_func;
57 57
  * Read a request and fill in the fields.
58 58
  * @param c The current connection
59 59
  * @return The new request_rec
60  
- */ 
  60
+ */
61 61
 request_rec *ap_read_request(conn_rec *c);
62 62
 
63 63
 /**
@@ -87,10 +87,10 @@ AP_DECLARE(void) ap_finalize_request_protocol(request_rec *r);
87 87
 /**
88 88
  * Send error back to client.
89 89
  * @param r The current request
90  
- * @param recursive_error last arg indicates error status in case we get 
91  
- *      an error in the process of trying to deal with an ErrorDocument 
92  
- *      to handle some other error.  In that case, we print the default 
93  
- *      report for the first thing that went wrong, and more briefly report 
  90
+ * @param recursive_error last arg indicates error status in case we get
  91
+ *      an error in the process of trying to deal with an ErrorDocument
  92
+ *      to handle some other error.  In that case, we print the default
  93
+ *      report for the first thing that went wrong, and more briefly report
94 94
  *      on the problem with the ErrorDocument.
95 95
  */
96 96
 AP_DECLARE(void) ap_send_error_response(request_rec *r, int recursive_error);
@@ -117,7 +117,7 @@ AP_DECLARE(void) ap_set_content_length(request_rec *r, apr_off_t length);
117 117
 AP_DECLARE(int) ap_set_keepalive(request_rec *r);
118 118
 
119 119
 /**
120  
- * Return the latest rational time from a request/mtime pair.  Mtime is 
  120
+ * Return the latest rational time from a request/mtime pair.  Mtime is
121 121
  * returned unless it's in the future, in which case we return the current time.
122 122
  * @param r The current request
123 123
  * @param mtime The last modified time
@@ -135,7 +135,7 @@ AP_DECLARE(apr_time_t) ap_rationalize_mtime(request_rec *r, apr_time_t mtime);
135 135
  * @param r The current request
136 136
  * @param type The content type
137 137
  * @return The content-type
138  
- */ 
  138
+ */
139 139
 AP_DECLARE(const char *) ap_make_content_type(request_rec *r,
140 140
                                               const char *type);
141 141
 
@@ -152,7 +152,7 @@ AP_DECLARE(void) ap_setup_make_content_type(apr_pool_t *pool);
152 152
  * @param force_weak Force the entity tag to be weak - it could be modified
153 153
  *                   again in as short an interval.
154 154
  * @return The entity tag
155  
- */ 
  155
+ */
156 156
 AP_DECLARE(char *) ap_make_etag(request_rec *r, int force_weak);
157 157
 
158 158
 /**
@@ -169,7 +169,7 @@ AP_DECLARE(void) ap_set_last_modified(request_rec *r);
169 169
 
170 170
 /**
171 171
  * Implements condition GET rules for HTTP/1.1 specification.  This function
172  
- * inspects the client headers and determines if the response fulfills 
  172
+ * inspects the client headers and determines if the response fulfills
173 173
  * the requirements specified.
174 174
  * @param r The current request
175 175
  * @return OK if the response fulfills the condition GET rules, some
@@ -189,7 +189,7 @@ AP_DECLARE(int) ap_meets_conditions(request_rec *r);
189 189
  */
190 190
 
191 191
 /**
192  
- * Send an entire file to the client, using sendfile if supported by the 
  192
+ * Send an entire file to the client, using sendfile if supported by the
193 193
  * current platform
194 194
  * @param fd The file to send.
195 195
  * @param r The current request
@@ -197,7 +197,7 @@ AP_DECLARE(int) ap_meets_conditions(request_rec *r);
197 197
  * @param length Amount of data to send
198 198
  * @param nbytes Amount of data actually sent
199 199
  */
200  
-AP_DECLARE(apr_status_t) ap_send_fd(apr_file_t *fd, request_rec *r, apr_off_t offset, 
  200
+AP_DECLARE(apr_status_t) ap_send_fd(apr_file_t *fd, request_rec *r, apr_off_t offset,
201 201
                                    apr_size_t length, apr_size_t *nbytes);
202 202
 
203 203
 #if APR_HAS_MMAP
@@ -278,7 +278,7 @@ AP_DECLARE(int) ap_method_in_list(ap_method_list_t *l, const char *method);
278 278
  * @return  None.
279 279
  */
280 280
 AP_DECLARE(void) ap_method_list_add(ap_method_list_t *l, const char *method);
281  
-    
  281
+
282 282
 /**
283 283
  * Remove an HTTP method name from an ap_method_list_t structure.
284 284
  *
@@ -296,12 +296,12 @@ AP_DECLARE(void) ap_method_list_remove(ap_method_list_t *l,
296 296
  * @return  None.
297 297
  */
298 298
 AP_DECLARE(void) ap_clear_method_list(ap_method_list_t *l);
299  
-    
  299
+
300 300
 /**
301  
- * Set the content type for this request (r->content_type). 
  301
+ * Set the content type for this request (r->content_type).
302 302
  * @param r The current request
303 303
  * @param ct The new content type
304  
- * @warning This function must be called to set r->content_type in order 
  304
+ * @warning This function must be called to set r->content_type in order
305 305
  * for the AddOutputFilterByType directive to work correctly.
306 306
  */
307 307
 AP_DECLARE(void) ap_set_content_type(request_rec *r, const char *ct);
@@ -389,10 +389,10 @@ AP_DECLARE(int) ap_rflush(request_rec *r);
389 389
  */
390 390
 AP_DECLARE(int) ap_index_of_response(int status);
391 391
 
392  
-/** 
  392
+/**
393 393
  * Return the Status-Line for a given status code (excluding the
394 394
  * HTTP-Version field). If an invalid or unknown status code is
395  
- * passed, "500 Internal Server Error" will be returned. 
  395
+ * passed, "500 Internal Server Error" will be returned.
396 396
  * @param status The HTTP status code
397 397
  * @return The Status-Line
398 398
  */
@@ -403,7 +403,7 @@ AP_DECLARE(const char *) ap_get_status_line(int status);
403 403
 /**
404 404
  * Setup the client to allow Apache to read the request body.
405 405
  * @param r The current request
406  
- * @param read_policy How the server should interpret a chunked 
  406
+ * @param read_policy How the server should interpret a chunked
407 407
  *                    transfer-encoding.  One of: <pre>
408 408
  *    REQUEST_NO_BODY          Send 413 error if message has any body
409 409
  *    REQUEST_CHUNKED_ERROR    Send 411 error if body without Content-Length
@@ -414,7 +414,7 @@ AP_DECLARE(const char *) ap_get_status_line(int status);
414 414
 AP_DECLARE(int) ap_setup_client_block(request_rec *r, int read_policy);
415 415
 
416 416
 /**
417  
- * Determine if the client has sent any data.  This also sends a 
  417
+ * Determine if the client has sent any data.  This also sends a
418 418
  * 100 Continue response to HTTP/1.1 clients, so modules should not be called
419 419
  * until the module is ready to read content.
420 420
  * @warning Never call this function more than once.
@@ -442,7 +442,7 @@ AP_DECLARE(long) ap_get_client_block(request_rec *r, char *buffer, apr_size_t bu
442 442
  * failing to read the request body would cause it to be interpreted
443 443
  * as the next request on a persistent connection.
444 444
  * @param r The current request
445  
- * @return error status if request is malformed, OK otherwise 
  445
+ * @return error status if request is malformed, OK otherwise
446 446
  */
447 447
 AP_DECLARE(int) ap_discard_request_body(request_rec *r);
448 448
 
@@ -450,17 +450,17 @@ AP_DECLARE(int) ap_discard_request_body(request_rec *r);
450 450
  * Setup the output headers so that the client knows how to authenticate
451 451
  * itself the next time, if an authentication request failed.
452 452
  * @param r The current request
453  
- */ 
  453
+ */
454 454
 AP_DECLARE(void) ap_note_auth_failure(request_rec *r);
455 455
 
456 456
 /**
457 457
  * @deprecated @see ap_note_auth_failure
458  
- */ 
  458
+ */
459 459
 AP_DECLARE(void) ap_note_basic_auth_failure(request_rec *r);
460 460
 
461 461
 /**
462 462
  * @deprecated @see ap_note_auth_failure
463  
- */ 
  463
+ */
464 464
 AP_DECLARE(void) ap_note_digest_auth_failure(request_rec *r);
465 465
 
466 466
 /**
@@ -477,18 +477,18 @@ AP_DECLARE_HOOK(int, note_auth_failure, (request_rec *r, const char *auth_type))
477 477
  * @param r The current request
478 478
  * @param pw The password as set in the headers
479 479
  * @return 0 (OK) if it set the 'pw' argument (and assured
480  
- *         a correct value in r->user); otherwise it returns 
481  
- *         an error code, either HTTP_INTERNAL_SERVER_ERROR if things are 
482  
- *         really confused, HTTP_UNAUTHORIZED if no authentication at all 
483  
- *         seemed to be in use, or DECLINED if there was authentication but 
484  
- *         it wasn't Basic (in which case, the caller should presumably 
  480
+ *         a correct value in r->user); otherwise it returns
  481
+ *         an error code, either HTTP_INTERNAL_SERVER_ERROR if things are
  482
+ *         really confused, HTTP_UNAUTHORIZED if no authentication at all
  483
+ *         seemed to be in use, or DECLINED if there was authentication but
  484
+ *         it wasn't Basic (in which case, the caller should presumably
485 485
  *         decline as well).
486 486
  */
487 487
 AP_DECLARE(int) ap_get_basic_auth_pw(request_rec *r, const char **pw);
488 488
 
489 489
 /**
490 490
  * parse_uri: break apart the uri
491  
- * @warning Side Effects: 
  491
+ * @warning Side Effects:
492 492
  *    @li sets r->args to rest after '?' (or NULL if no '?')
493 493
  *    @li sets r->uri to request uri (without r->args part)
494 494
  *    @li sets r->hostname (if not set already) from request (scheme://host:port)
@@ -512,13 +512,13 @@ AP_DECLARE(int) ap_getline(char *s, int n, request_rec *r, int fold);
512 512
 /**
513 513
  * Get the next line of input for the request
514 514
  *
515  
- * Note: on ASCII boxes, ap_rgetline is a macro which simply calls 
  515
+ * Note: on ASCII boxes, ap_rgetline is a macro which simply calls
516 516
  *       ap_rgetline_core to get the line of input.
517  
- * 
  517
+ *
518 518
  *       on EBCDIC boxes, ap_rgetline is a wrapper function which
519 519
  *       translates ASCII protocol lines to the local EBCDIC code page
520 520
  *       after getting the line of input.
521  
- *       
  521
+ *
522 522
  * @param s Pointer to the pointer to the buffer into which the line
523 523
  *          should be read; if *s==NULL, a buffer of the necessary size
524 524
  *          to hold the data will be allocated from the request pool
@@ -532,7 +532,7 @@ AP_DECLARE(int) ap_getline(char *s, int n, request_rec *r, int fold);
532 532
  *         Other errors where appropriate
533 533
  */
534 534
 #if APR_CHARSET_EBCDIC
535  
-AP_DECLARE(apr_status_t) ap_rgetline(char **s, apr_size_t n, 
  535
+AP_DECLARE(apr_status_t) ap_rgetline(char **s, apr_size_t n,
536 536
                                      apr_size_t *read,
537 537
                                      request_rec *r, int fold,
538 538
                                      apr_bucket_brigade *bb);
@@ -542,7 +542,7 @@ AP_DECLARE(apr_status_t) ap_rgetline(char **s, apr_size_t n,
542 542
 #endif
543 543
 
544 544
 /** @see ap_rgetline */
545  
-AP_DECLARE(apr_status_t) ap_rgetline_core(char **s, apr_size_t n, 
  545
+AP_DECLARE(apr_status_t) ap_rgetline_core(char **s, apr_size_t n,
546 546
                                           apr_size_t *read,
547 547
                                           request_rec *r, int fold,
548 548
                                           apr_bucket_brigade *bb);
@@ -591,7 +591,7 @@ AP_DECLARE_HOOK(void,pre_read_request,(request_rec *r, conn_rec *c))
591 591
  * @return OK or DECLINED
592 592
  */
593 593
 AP_DECLARE_HOOK(int,post_read_request,(request_rec *r))
594  
-    
  594
+
595 595
 /**
596 596
  * This hook allows modules to perform any module-specific logging activities
597 597
  * over and above the normal server things.
@@ -649,7 +649,7 @@ AP_DECLARE_DATA extern const apr_bucket_type_t ap_bucket_type_error;
649 649
 /**
650 650
  * Make the bucket passed in an error bucket
651 651
  * @param b The bucket to make into an error bucket
652  
- * @param error The HTTP error code to put in the bucket. 
  652
+ * @param error The HTTP error code to put in the bucket.
653 653
  * @param buf An optional error string to put in the bucket.
654 654
  * @param p A pool to allocate out of.
655 655
  * @return The new bucket, or NULL if allocation failed
@@ -659,7 +659,7 @@ AP_DECLARE(apr_bucket *) ap_bucket_error_make(apr_bucket *b, int error,
659 659
 
660 660
 /**
661 661
  * Create a bucket referring to an HTTP error.
662  
- * @param error The HTTP error code to put in the bucket. 
  662
+ * @param error The HTTP error code to put in the bucket.
663 663
  * @param buf An optional error string to put in the bucket.
664 664
  * @param p A pool to allocate the error string out of.
665 665
  * @param list The bucket allocator from which to allocate the bucket
16  include/http_request.h
@@ -91,7 +91,7 @@ AP_DECLARE(request_rec *) ap_sub_req_lookup_file(const char *new_file,
91 91
                                               const request_rec *r,
92 92
                                               ap_filter_t *next_filter);
93 93
 /**
94  
- * Create a subrequest for the given apr_dir_read result.  This subrequest