Browse files

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...
1 parent cdd5ed7 commit 7d838a5bf6e627d6f6a06e630338610cfea1a895 @jimjag jimjag committed Sep 23, 2011
Showing with 528 additions and 528 deletions.
  1. +7 −7 include/ap_config.h
  2. +6 −6 include/ap_hooks.h
  3. +6 −6 include/ap_listen.h
  4. +8 −8 include/ap_mpm.h
  5. +2 −2 include/ap_regex.h
  6. +31 −31 include/ap_regkey.h
  7. +3 −3 include/ap_release.h
  8. +1 −1 include/ap_slotmem.h
  9. +10 −10 include/ap_socache.h
  10. +7 −7 include/http_connection.h
  11. +17 −17 include/http_core.h
  12. +41 −41 include/http_log.h
  13. +37 −37 include/http_protocol.h
  14. +8 −8 include/http_request.h
  15. +7 −7 include/http_vhost.h
  16. +80 −80 include/httpd.h
  17. +1 −1 include/mod_core.h
  18. +8 −8 include/mpm_common.h
  19. +5 −5 include/scoreboard.h
  20. +3 −3 include/util_cfgtree.h
  21. +2 −2 include/util_charset.h
  22. +25 −25 include/util_filter.h
  23. +10 −10 include/util_ldap.h
  24. +2 −2 include/util_mutex.h
  25. +13 −13 include/util_script.h
  26. +3 −3 include/util_time.h
  27. +1 −1 modules/aaa/mod_authz_dbd.h
  28. +1 −1 modules/arch/unix/mod_unixd.h
  29. +19 −19 modules/arch/win32/mod_isapi.h
  30. +5 −5 modules/cache/cache_cache.h
  31. +4 −4 modules/cache/cache_hash.h
  32. +3 −3 modules/cache/cache_pqueue.h
  33. +1 −1 modules/core/mod_so.h
  34. +5 −5 modules/core/mod_watchdog.h
  35. +2 −2 modules/database/mod_dbd.h
  36. +8 −8 modules/filters/libsed.h
  37. +2 −2 modules/filters/mod_include.h
  38. +1 −1 modules/filters/mod_ratelimit.h
  39. +9 −9 modules/filters/regexp.h
  40. +8 −8 modules/filters/sed.h
  41. +4 −4 modules/generators/mod_cgi.h
  42. +1 −1 modules/generators/mod_suexec.h
  43. +8 −8 modules/ldap/util_ldap_cache.h
  44. +7 −7 modules/loggers/mod_log_config.h
  45. +3 −3 modules/lua/lua_vmprep.h
  46. +2 −2 modules/lua/mod_lua.h
  47. +1 −1 modules/mappers/mod_rewrite.h
  48. +32 −32 modules/proxy/ajp.h
  49. +13 −13 modules/proxy/ajp_header.h
  50. +3 −3 modules/proxy/mod_serf.h
  51. +1 −1 modules/session/mod_session.h
  52. +2 −2 modules/ssl/mod_ssl.h
  53. +10 −10 modules/ssl/ssl_private.h
  54. +1 −1 modules/ssl/ssl_util_ssl.h
  55. +1 −1 os/netware/os.h
  56. +2 −2 os/netware/pre_nw.h
  57. +3 −3 os/unix/unixd.h
  58. +3 −3 os/win32/os.h
  59. +1 −1 server/mpm/event/fdqueue.h
  60. +1 −1 server/mpm/mpmt_os2/mpm_default.h
  61. +1 −1 server/mpm/simple/simple_event.h
  62. +5 −5 server/mpm/winnt/mpm_winnt.h
  63. +5 −5 server/util_expr_parse.h
  64. +6 −6 support/suexec.h
View
14 include/ap_config.h
@@ -25,8 +25,8 @@
#include "ap_hooks.h"
/* Although this file doesn't declare any hooks, declare the exports group here */
-/**
- * @defgroup exports Apache exports
+/**
+ * @defgroup exports Apache exports
* @ingroup APACHE_CORE
*/
@@ -40,8 +40,8 @@
* @see AP_DECLARE_EXPORT
*
* AP_DECLARE_STATIC and AP_DECLARE_EXPORT are left undefined when
- * including Apache's Core headers, to import and link the symbols from the
- * dynamic Apache Core library and assure appropriate indirection and calling
+ * including Apache's Core headers, to import and link the symbols from the
+ * dynamic Apache Core library and assure appropriate indirection and calling
* conventions at compile time.
*/
# define AP_DECLARE_STATIC
@@ -67,7 +67,7 @@
#define AP_DECLARE(type) type
/**
- * Apache Core dso variable argument and hook functions are declared with
+ * Apache Core dso variable argument and hook functions are declared with
* AP_DECLARE_NONSTD(), as they must use the C language calling convention.
* @see AP_DECLARE
* @code
@@ -106,7 +106,7 @@
/**
* Declare a dso module's exported module structure as AP_MODULE_DECLARE_DATA.
*
- * Unless AP_MODULE_DECLARE_STATIC is defined at compile time, symbols
+ * Unless AP_MODULE_DECLARE_STATIC is defined at compile time, symbols
* declared with AP_MODULE_DECLARE_DATA are always exported.
* @code
* module AP_MODULE_DECLARE_DATA mod_tag
@@ -124,7 +124,7 @@
* AP_MODULE_DECLARE_EXPORT is a no-op. Unless contradicted by the
* AP_MODULE_DECLARE_STATIC compile-time symbol, it is assumed and defined.
*
- * The old SHARED_MODULE compile-time symbol is now the default behavior,
+ * The old SHARED_MODULE compile-time symbol is now the default behavior,
* so it is no longer referenced anywhere with Apache 2.0.
*/
#define AP_MODULE_DECLARE_EXPORT
View
12 include/ap_hooks.h
@@ -23,8 +23,8 @@
#define AP_HOOKS_H
/* Although this file doesn't declare any hooks, declare the hook group here */
-/**
- * @defgroup hooks Apache Hooks
+/**
+ * @defgroup hooks Apache Hooks
* @ingroup APACHE_CORE
*/
@@ -50,8 +50,8 @@
* @see AP_DECLARE_EXPORT
*
* AP_DECLARE_STATIC and AP_DECLARE_EXPORT are left undefined when
- * including Apache's Core headers, to import and link the symbols from the
- * dynamic Apache Core library and assure appropriate indirection and calling
+ * including Apache's Core headers, to import and link the symbols from the
+ * dynamic Apache Core library and assure appropriate indirection and calling
* conventions at compile time.
*/
# define AP_DECLARE_STATIC
@@ -119,8 +119,8 @@
args_use,ok,decline)
/**
- * Implement a hook that runs until a function returns something other than
- * decline. If all functions return decline, the hook runner returns decline.
+ * Implement a hook that runs until a function returns something other than
+ * decline. If all functions return decline, the hook runner returns decline.
* The implementation is called ap_run_<i>name</i>.
*
* @param ret The return type of the hook (and the hook runner)
View
12 include/ap_listen.h
@@ -39,7 +39,7 @@ typedef struct ap_listen_rec ap_listen_rec;
typedef apr_status_t (*accept_function)(void **csd, ap_listen_rec *lr, apr_pool_t *ptrans);
/**
- * @brief Apache's listeners record.
+ * @brief Apache's listeners record.
*
* These are used in the Multi-Processing Modules
* to setup all of the sockets for the MPM to listen to and accept on.
@@ -50,7 +50,7 @@ struct ap_listen_rec {
*/
ap_listen_rec *next;
/**
- * The actual socket
+ * The actual socket
*/
apr_socket_t *sd;
/**
@@ -62,7 +62,7 @@ struct ap_listen_rec {
*/
accept_function accept_func;
/**
- * Is this socket currently active
+ * Is this socket currently active
*/
int active;
/**
@@ -88,7 +88,7 @@ AP_DECLARE(void) ap_listen_pre_config(void);
* sockets. This executes the listen and bind on the sockets.
* @param s The global server_rec
* @return The number of open sockets.
- */
+ */
AP_DECLARE(int) ap_setup_listeners(server_rec *s);
/**
@@ -107,9 +107,9 @@ AP_DECLARE_NONSTD(int) ap_close_selected_listeners(ap_slave_t *);
* should not ever be called by external modules. ALL MPMs should include
* LISTEN_COMMANDS in their command_rec table so that these functions are
* called.
- */
+ */
AP_DECLARE_NONSTD(const char *) ap_set_listenbacklog(cmd_parms *cmd, void *dummy, const char *arg);
-AP_DECLARE_NONSTD(const char *) ap_set_listener(cmd_parms *cmd, void *dummy,
+AP_DECLARE_NONSTD(const char *) ap_set_listener(cmd_parms *cmd, void *dummy,
int argc, char *const argv[]);
AP_DECLARE_NONSTD(const char *) ap_set_send_buffer_size(cmd_parms *cmd, void *dummy,
const char *arg);
View
16 include/ap_mpm.h
@@ -44,7 +44,7 @@ extern "C" {
The MPM may or may not be multithreaded. In the event that it is
multithreaded, at any instant it guarantees a 1:1 mapping of threads
- ap_process_connection invocations.
+ ap_process_connection invocations.
Note: In the future it will be possible for ap_process_connection
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
* Spawn a process with privileges that another module has requested
* @param r The request_rec of the current request
* @param newproc The resulting process handle.
- * @param progname The program to run
- * @param args the arguments to pass to the new program. The first
+ * @param progname The program to run
+ * @param args the arguments to pass to the new program. The first
* one should be the program name.
- * @param env The new environment apr_table_t for the new process. This
+ * @param env The new environment apr_table_t for the new process. This
* should be a list of NULL-terminated strings.
* @param attr the procattr we should use to determine how to create the new
* process
- * @param p The pool to use.
+ * @param p The pool to use.
*/
AP_DECLARE(apr_status_t) ap_os_create_privileged_process(
const request_rec *r,
- apr_proc_t *newproc,
+ apr_proc_t *newproc,
const char *progname,
- const char * const *args,
+ const char * const *args,
const char * const *env,
- apr_procattr_t *attr,
+ apr_procattr_t *attr,
apr_pool_t *p);
/* Subtypes/Values for AP_MPMQ_IS_THREADED and AP_MPMQ_IS_FORKED */
View
4 include/ap_regex.h
@@ -119,7 +119,7 @@ AP_DECLARE(int) ap_regcomp(ap_regex_t *preg, const char *regex, int cflags);
* @param eflags Bitwise OR of AP_REG_* flags (NOTBOL and NOTEOL supported,
* other flags are ignored)
* @return 0 for successful match, \p AP_REG_NOMATCH otherwise
- */
+ */
AP_DECLARE(int) ap_regexec(const ap_regex_t *preg, const char *string,
apr_size_t nmatch, ap_regmatch_t *pmatch, int eflags);
@@ -146,7 +146,7 @@ AP_DECLARE(int) ap_regexec_len(const ap_regex_t *preg, const char *buff,
* @param errbuf A buffer to store the error in
* @param errbuf_size The size of the buffer
*/
-AP_DECLARE(apr_size_t) ap_regerror(int errcode, const ap_regex_t *preg,
+AP_DECLARE(apr_size_t) ap_regerror(int errcode, const ap_regex_t *preg,
char *errbuf, apr_size_t errbuf_size);
/** Destroy a pre-compiled regex.
View
62 include/ap_regkey.h
@@ -34,7 +34,7 @@ extern "C" {
typedef struct ap_regkey_t ap_regkey_t;
-/* Used to recover AP_REGKEY_* constants
+/* Used to recover AP_REGKEY_* constants
*/
AP_DECLARE(const ap_regkey_t *) ap_regkey_const(int i);
@@ -64,8 +64,8 @@ AP_DECLARE(const ap_regkey_t *) ap_regkey_const(int i);
* AP_REGKEY_CURRENT_USER
* AP_REGKEY_LOCAL_MACHINE
* AP_REGKEY_USERS
- * AP_REGKEY_PERFORMANCE_DATA
- * AP_REGKEY_DYN_DATA
+ * AP_REGKEY_PERFORMANCE_DATA
+ * AP_REGKEY_DYN_DATA
* </PRE>
* @param keyname The path of the key relative to the parent key
* @param flags Or'ed value of:
@@ -77,10 +77,10 @@ AP_DECLARE(const ap_regkey_t *) ap_regkey_const(int i);
* </PRE>
* @param pool The pool in which newkey is allocated
*/
-AP_DECLARE(apr_status_t) ap_regkey_open(ap_regkey_t **newkey,
+AP_DECLARE(apr_status_t) ap_regkey_open(ap_regkey_t **newkey,
const ap_regkey_t *parentkey,
const char *keyname,
- apr_int32_t flags,
+ apr_int32_t flags,
apr_pool_t *pool);
/**
@@ -98,32 +98,32 @@ AP_DECLARE(apr_status_t) ap_regkey_close(ap_regkey_t *key);
* AP_REGKEY_CURRENT_USER
* AP_REGKEY_LOCAL_MACHINE
* AP_REGKEY_USERS
- * AP_REGKEY_PERFORMANCE_DATA
- * AP_REGKEY_DYN_DATA
+ * AP_REGKEY_PERFORMANCE_DATA
+ * AP_REGKEY_DYN_DATA
* </PRE>
* @param keyname The path of the key relative to the parent key
* @param pool The pool used for temp allocations
* @remark ap_regkey_remove() is not recursive, although it removes
- * all values within the given keyname, it will not remove a key
+ * all values within the given keyname, it will not remove a key
* containing subkeys.
*/
-AP_DECLARE(apr_status_t) ap_regkey_remove(const ap_regkey_t *parent,
+AP_DECLARE(apr_status_t) ap_regkey_remove(const ap_regkey_t *parent,
const char *keyname,
apr_pool_t *pool);
/**
* Win32 Only: Retrieve a registry value string from an open key.
- * @param result The string value retrieved
+ * @param result The string value retrieved
* @param key The registry key to retrieve the value from
* @param valuename The named value to retrieve (pass "" for the default)
* @param pool The pool used to store the result
* @remark There is no toggle to prevent environment variable expansion
* if the registry value is set with AP_REG_EXPAND (REG_EXPAND_SZ), such
* expansions are always performed.
*/
-AP_DECLARE(apr_status_t) ap_regkey_value_get(char **result,
- ap_regkey_t *key,
- const char *valuename,
+AP_DECLARE(apr_status_t) ap_regkey_value_get(char **result,
+ ap_regkey_t *key,
+ const char *valuename,
apr_pool_t *pool);
/**
@@ -135,26 +135,26 @@ AP_DECLARE(apr_status_t) ap_regkey_value_get(char **result,
* values will find all %foo% variables expanded from the environment.
* @param pool The pool used for temp allocations
*/
-AP_DECLARE(apr_status_t) ap_regkey_value_set(ap_regkey_t *key,
- const char *valuename,
- const char *value,
+AP_DECLARE(apr_status_t) ap_regkey_value_set(ap_regkey_t *key,
+ const char *valuename,
+ const char *value,
apr_int32_t flags,
apr_pool_t *pool);
/**
* Win32 Only: Retrieve a raw byte value from an open key.
- * @param result The raw bytes value retrieved
- * @param resultsize Pointer to a variable to store the number raw bytes retrieved
+ * @param result The raw bytes value retrieved
+ * @param resultsize Pointer to a variable to store the number raw bytes retrieved
* @param resulttype Pointer to a variable to store the registry type of the value retrieved
* @param key The registry key to retrieve the value from
* @param valuename The named value to retrieve (pass "" for the default)
* @param pool The pool used to store the result
*/
-AP_DECLARE(apr_status_t) ap_regkey_value_raw_get(void **result,
+AP_DECLARE(apr_status_t) ap_regkey_value_raw_get(void **result,
apr_size_t *resultsize,
apr_int32_t *resulttype,
- ap_regkey_t *key,
- const char *valuename,
+ ap_regkey_t *key,
+ const char *valuename,
apr_pool_t *pool);
/**
@@ -163,13 +163,13 @@ AP_DECLARE(apr_status_t) ap_regkey_value_raw_get(void **result,
* @param valuename The named value to store (pass "" for the default)
* @param value The bytes to store for the named value
* @param valuesize The number of bytes for value
- * @param valuetype The
+ * @param valuetype The
* values will find all %foo% variables expanded from the environment.
* @param pool The pool used for temp allocations
*/
-AP_DECLARE(apr_status_t) ap_regkey_value_raw_set(ap_regkey_t *key,
- const char *valuename,
- const void *value,
+AP_DECLARE(apr_status_t) ap_regkey_value_raw_set(ap_regkey_t *key,
+ const char *valuename,
+ const void *value,
apr_size_t valuesize,
apr_int32_t valuetype,
apr_pool_t *pool);
@@ -181,9 +181,9 @@ AP_DECLARE(apr_status_t) ap_regkey_value_raw_set(ap_regkey_t *key,
* @param valuename The named value to retrieve (pass "" for the default)
* @param pool The pool used to store the result
*/
-AP_DECLARE(apr_status_t) ap_regkey_value_array_get(apr_array_header_t **result,
+AP_DECLARE(apr_status_t) ap_regkey_value_array_get(apr_array_header_t **result,
ap_regkey_t *key,
- const char *valuename,
+ const char *valuename,
apr_pool_t *pool);
/**
@@ -194,9 +194,9 @@ AP_DECLARE(apr_status_t) ap_regkey_value_array_get(apr_array_header_t **result,
* @param elts The number of elements in the elts string array
* @param pool The pool used for temp allocations
*/
-AP_DECLARE(apr_status_t) ap_regkey_value_array_set(ap_regkey_t *key,
- const char *valuename,
- int nelts,
+AP_DECLARE(apr_status_t) ap_regkey_value_array_set(ap_regkey_t *key,
+ const char *valuename,
+ int nelts,
const char * const * elts,
apr_pool_t *pool);
@@ -206,7 +206,7 @@ AP_DECLARE(apr_status_t) ap_regkey_value_array_set(ap_regkey_t *key,
* @param valuename The named value to remove (pass "" for the default)
* @param pool The pool used for temp allocations
*/
-AP_DECLARE(apr_status_t) ap_regkey_value_remove(const ap_regkey_t *key,
+AP_DECLARE(apr_status_t) ap_regkey_value_remove(const ap_regkey_t *key,
const char *valuename,
apr_pool_t *pool);
View
6 include/ap_release.h
@@ -34,10 +34,10 @@
* The tokens are listed in order of their significance for identifying the
* application.
*
- * "Product tokens should be short and to the point -- use of them for
+ * "Product tokens should be short and to the point -- use of them for
* advertizing or other non-essential information is explicitly forbidden."
*
- * Example: "Apache/1.1.0 MrWidget/0.1-alpha"
+ * Example: "Apache/1.1.0 MrWidget/0.1-alpha"
*/
#define AP_SERVER_BASEVENDOR "Apache Software Foundation"
#define AP_SERVER_BASEPROJECT "Apache HTTP Server"
@@ -48,7 +48,7 @@
#define AP_SERVER_PATCHLEVEL_NUMBER 15
#define AP_SERVER_DEVBUILD_BOOLEAN 1
-/* Synchronize the above with docs/manual/style/version.ent */
+/* Synchronize the above with docs/manual/style/version.ent */
#if AP_SERVER_DEVBUILD_BOOLEAN
#define AP_SERVER_ADD_STRING "-dev"
View
2 include/ap_slotmem.h
@@ -148,7 +148,7 @@ struct ap_slotmem_provider_t {
/**
* return number of free (not used) slots allocated for this entry.
* Valid for slots which are AP_SLOTMEM_TYPE_PREGRAB as well as
- * any which use get/release.
+ * any which use get/release.
* @param s ap_slotmem_instance_t to use.
* @return number of slots
*/
View
20 include/ap_socache.h
@@ -24,7 +24,7 @@
*/
#ifndef AP_SOCACHE_H
-#define AP_SOCACHE_H
+#define AP_SOCACHE_H
#include "httpd.h"
#include "ap_provider.h"
@@ -93,7 +93,7 @@ typedef struct ap_socache_provider_t {
/** Bitmask of AP_SOCACHE_FLAG_* flags: */
unsigned int flags;
- /**
+ /**
* Create a session cache based on the given configuration string.
* The instance pointer returned in the instance paramater will be
* passed as the first argument to subsequent invocations.
@@ -102,11 +102,11 @@ typedef struct ap_socache_provider_t {
* @param arg Used-specified configuration string. May be NULL to
* force use of defaults.
* @param tmp Pool to be used for any temporary allocations
- * @param p Pool to be use for any allocations lasting as long as
+ * @param p Pool to be use for any allocations lasting as long as
* the created instance
* @return NULL on success, or an error string on failure.
*/
- const char *(*create)(ap_socache_instance_t **instance, const char *arg,
+ const char *(*create)(ap_socache_instance_t **instance, const char *arg,
apr_pool_t *tmp, apr_pool_t *p);
/* Initialize the cache. The cname must be of maximum length 16
@@ -124,18 +124,18 @@ typedef struct ap_socache_provider_t {
* @param pool Pool for long-lived allocations
* @return APR status value indicating success.
*/
- apr_status_t (*init)(ap_socache_instance_t *instance, const char *cname,
+ apr_status_t (*init)(ap_socache_instance_t *instance, const char *cname,
const struct ap_socache_hints *hints,
server_rec *s, apr_pool_t *pool);
- /**
+ /**
* Destroy a given cache instance object.
* @param instance The cache instance to destroy.
* @param s Associated server structure (for logging purposes)
*/
void (*destroy)(ap_socache_instance_t *instance, server_rec *s);
- /**
+ /**
* Store an object in a cache instance.
* @param instance The cache instance
* @param s Associated server structure (for logging purposes)
@@ -147,9 +147,9 @@ typedef struct ap_socache_provider_t {
* @param pool Pool for temporary allocations.
* @return APR status value.
*/
- apr_status_t (*store)(ap_socache_instance_t *instance, server_rec *s,
- const unsigned char *id, unsigned int idlen,
- apr_time_t expiry,
+ apr_status_t (*store)(ap_socache_instance_t *instance, server_rec *s,
+ const unsigned char *id, unsigned int idlen,
+ apr_time_t expiry,
unsigned char *data, unsigned int datalen,
apr_pool_t *pool);
View
14 include/http_connection.h
@@ -41,7 +41,7 @@ extern "C" {
* This is the protocol module driver. This calls all of the
* pre-connection and connection hooks for all protocol modules.
* @param c The connection on which the request is read
- * @param csd The mechanism on which this connection is to be read.
+ * @param csd The mechanism on which this connection is to be read.
* Most times this will be a socket, but it is up to the module
* that accepts the request to determine the exact type.
*/
@@ -74,15 +74,15 @@ AP_DECLARE(int) ap_start_lingering_close(conn_rec *c);
/* Hooks */
/**
- * create_connection is a RUN_FIRST hook which allows modules to create
- * connections. In general, you should not install filters with the
- * create_connection hook. If you require vhost configuration information
+ * create_connection is a RUN_FIRST hook which allows modules to create
+ * connections. In general, you should not install filters with the
+ * create_connection hook. If you require vhost configuration information
* to make filter installation decisions, you must use the pre_connection
* or install_network_transport hook. This hook should close the connection
* if it encounters a fatal error condition.
*
* @param p The pool from which to allocate the connection record
- * @param server The server record to create the connection too.
+ * @param server The server record to create the connection too.
* @param csd The socket that has been accepted
* @param conn_id A unique identifier for this connection. The ID only
* needs to be unique at that time, not forever.
@@ -93,13 +93,13 @@ AP_DECLARE(int) ap_start_lingering_close(conn_rec *c);
AP_DECLARE_HOOK(conn_rec *, create_connection,
(apr_pool_t *p, server_rec *server, apr_socket_t *csd,
long conn_id, void *sbh, apr_bucket_alloc_t *alloc))
-
+
/**
* This hook gives protocol modules an opportunity to set everything up
* before calling the protocol handler. All pre-connection hooks are
* run until one returns something other than ok or decline
* @param c The connection on which the request has been received.
- * @param csd The mechanism on which this connection is to be read.
+ * @param csd The mechanism on which this connection is to be read.
* Most times this will be a socket, but it is up to the module
* that accepts the request to determine the exact type.
* @return OK or DECLINED
View
34 include/http_core.h
@@ -88,7 +88,7 @@ extern "C" {
/** @} */
/**
- * @defgroup get_remote_host Remote Host Resolution
+ * @defgroup get_remote_host Remote Host Resolution
* @ingroup APACHE_CORE_HTTPD
* @{
*/
@@ -152,7 +152,7 @@ AP_DECLARE(int) ap_allow_overrides(request_rec *r);
/**
* Retrieve the document root for this server
* @param r The current request
- * @warning Don't use this! If your request went through a Userdir, or
+ * @warning Don't use this! If your request went through a Userdir, or
* something like that, it'll screw you. But it's back-compatible...
* @return The document root
*/
@@ -175,10 +175,10 @@ AP_DECLARE(const char *) ap_document_root(request_rec *r);
* never forced.
* REMOTE_DOUBLE_REV will always force a DNS lookup, and also force
* a double reverse lookup, regardless of the HostnameLookups
- * setting. The result is the (double reverse checked)
+ * setting. The result is the (double reverse checked)
* hostname, or NULL if any of the lookups fail.
* </pre>
- * @param str_is_ip unless NULL is passed, this will be set to non-zero on output when an IP address
+ * @param str_is_ip unless NULL is passed, this will be set to non-zero on output when an IP address
* string is returned
* @return The remote hostname
*/
@@ -228,7 +228,7 @@ AP_DECLARE(const char *) ap_get_server_name_for_url(request_rec *r);
AP_DECLARE(apr_port_t) ap_get_server_port(const request_rec *r);
/**
- * Return the limit on bytes in request msg body
+ * Return the limit on bytes in request msg body
* @param r The current request
* @return the maximum number of bytes in the request msg body
*/
@@ -276,16 +276,16 @@ AP_DECLARE_NONSTD(int) ap_core_translate(request_rec *r);
/** @see require_line */
typedef struct require_line require_line;
-/**
- * @brief A structure to keep track of authorization requirements
+/**
+ * @brief A structure to keep track of authorization requirements
*/
struct require_line {
/** Where the require line is in the config file. */
apr_int64_t method_mask;
/** The complete string from the command line */
char *requirement;
};
-
+
/**
* Return the type of authorization required for this request
* @param r The current request
@@ -298,7 +298,7 @@ AP_DECLARE(const char *) ap_auth_type(request_rec *r);
* @param r The current request
* @return The current authorization realm
*/
-AP_DECLARE(const char *) ap_auth_name(request_rec *r);
+AP_DECLARE(const char *) ap_auth_name(request_rec *r);
/**
* How the requires lines must be met.
@@ -355,10 +355,10 @@ AP_DECLARE(apr_socket_t *) ap_get_conn_socket(conn_rec *c);
#endif
/**
- * @brief Per-request configuration
+ * @brief Per-request configuration
*/
typedef struct {
- /** bucket brigade used by getline for look-ahead and
+ /** bucket brigade used by getline for look-ahead and
* ap_get_client_block for holding left-over request body */
struct apr_bucket_brigade *bb;
@@ -474,8 +474,8 @@ typedef enum {
srv_sig_withmail
} server_signature_e;
-/**
- * @brief Per-directory configuration
+/**
+ * @brief Per-directory configuration
*/
typedef struct {
/** path of the directory/regex/etc. see also d_is_fnmatch/absolute below */
@@ -495,13 +495,13 @@ typedef struct {
allow_options_t opts_remove;
overrides_t override;
allow_options_t override_opts;
-
+
/* Custom response config. These can contain text or a URL to redirect to.
* if response_code_strings is NULL then there are none in the config,
* if it's not null then it's allocated to sizeof(char*)*RESPONSE_CODES.
* This lets us do quick merges in merge_core_dir_configs().
*/
-
+
char **response_code_strings; /* from ErrorDocument, not from
* ap_custom_response() */
@@ -625,15 +625,15 @@ typedef struct {
/* Per-server core configuration */
typedef struct {
-
+
char *gprof_dir;
/* Name translations --- we want the core to be able to do *something*
* so it's at least a minimally functional web server on its own (and
* can be tested that way). But let's keep it to the bare minimum:
*/
const char *ap_document_root;
-
+
/* Access control */
char *access_name;
View
82 include/http_log.h
@@ -88,21 +88,21 @@ extern "C" {
#define APLOG_NOERRNO (APLOG_LEVELMASK + 1)
/** Use APLOG_TOCLIENT on ap_log_rerror() to give content
- * handlers the option of including the error text in the
+ * handlers the option of including the error text in the
* ErrorDocument sent back to the client. Setting APLOG_TOCLIENT
- * will cause the error text to be saved in the request_rec->notes
+ * will cause the error text to be saved in the request_rec->notes
* table, keyed to the string "error-notes", if and only if:
* - the severity level of the message is APLOG_WARNING or greater
* - there are no other "error-notes" set in request_rec->notes
* Once error-notes is set, it is up to the content handler to
* determine whether this text should be sent back to the client.
- * Note: Client generated text streams sent back to the client MUST
+ * Note: Client generated text streams sent back to the client MUST
* be escaped to prevent CSS attacks.
*/
#define APLOG_TOCLIENT ((APLOG_LEVELMASK + 1) * 2)
/* normal but significant condition on startup, usually printed to stderr */
-#define APLOG_STARTUP ((APLOG_LEVELMASK + 1) * 4)
+#define APLOG_STARTUP ((APLOG_LEVELMASK + 1) * 4)
#ifndef DEFAULT_LOGLEVEL
#define DEFAULT_LOGLEVEL APLOG_WARNING
@@ -285,7 +285,7 @@ AP_DECLARE(void) ap_open_stderr_log(apr_pool_t *p);
* @param p The pool to allocate out of
* @param file Name of the file to log stderr output
*/
-AP_DECLARE(apr_status_t) ap_replace_stderr_log(apr_pool_t *p,
+AP_DECLARE(apr_status_t) ap_replace_stderr_log(apr_pool_t *p,
const char *file);
/**
@@ -295,9 +295,9 @@ AP_DECLARE(apr_status_t) ap_replace_stderr_log(apr_pool_t *p,
* @param ptemp Pool used for temporary allocations
* @param s_main The main server
* @note ap_open_logs isn't expected to be used by modules, it is
- * an internal core function
+ * an internal core function
*/
-int ap_open_logs(apr_pool_t *pconf, apr_pool_t *plog,
+int ap_open_logs(apr_pool_t *pconf, apr_pool_t *plog,
apr_pool_t *ptemp, server_rec *s_main);
/**
@@ -310,13 +310,13 @@ int ap_open_logs(apr_pool_t *pconf, apr_pool_t *plog,
*/
void ap_logs_child_init(apr_pool_t *p, server_rec *s);
-/*
+/*
* The primary logging functions, ap_log_error, ap_log_rerror, ap_log_cerror,
- * and ap_log_perror use a printf style format string to build the log message.
- * It is VERY IMPORTANT that you not include any raw data from the network,
- * such as the request-URI or request header fields, within the format
- * string. Doing so makes the server vulnerable to a denial-of-service
- * attack and other messy behavior. Instead, use a simple format string
+ * and ap_log_perror use a printf style format string to build the log message.
+ * It is VERY IMPORTANT that you not include any raw data from the network,
+ * such as the request-URI or request header fields, within the format
+ * string. Doing so makes the server vulnerable to a denial-of-service
+ * attack and other messy behavior. Instead, use a simple format string
* like "%s", followed by the string containing the untrusted data.
*/
@@ -338,11 +338,11 @@ void ap_logs_child_init(apr_pool_t *p, server_rec *s);
* in preference to calling this function. Otherwise, if a conn_rec is
* available, use that with ap_log_cerror() in preference to calling
* this function.
- * @warning It is VERY IMPORTANT that you not include any raw data from
- * the network, such as the request-URI or request header fields, within
- * the format string. Doing so makes the server vulnerable to a
- * denial-of-service attack and other messy behavior. Instead, use a
- * simple format string like "%s", followed by the string containing the
+ * @warning It is VERY IMPORTANT that you not include any raw data from
+ * the network, such as the request-URI or request header fields, within
+ * the format string. Doing so makes the server vulnerable to a
+ * denial-of-service attack and other messy behavior. Instead, use a
+ * simple format string like "%s", followed by the string containing the
* untrusted data.
*/
#ifdef DOXYGEN
@@ -381,11 +381,11 @@ AP_DECLARE(void) ap_log_error_(const char *file, int line, int module_index,
* @param ... The arguments to use to fill out fmt.
* @note ap_log_perror is implemented as a macro
* @note Use APLOG_MARK to fill out file, line, and module_index
- * @warning It is VERY IMPORTANT that you not include any raw data from
- * the network, such as the request-URI or request header fields, within
- * the format string. Doing so makes the server vulnerable to a
- * denial-of-service attack and other messy behavior. Instead, use a
- * simple format string like "%s", followed by the string containing the
+ * @warning It is VERY IMPORTANT that you not include any raw data from
+ * the network, such as the request-URI or request header fields, within
+ * the format string. Doing so makes the server vulnerable to a
+ * denial-of-service attack and other messy behavior. Instead, use a
+ * simple format string like "%s", followed by the string containing the
* untrusted data.
*/
#ifdef DOXYGEN
@@ -423,11 +423,11 @@ AP_DECLARE(void) ap_log_perror_(const char *file, int line, int module_index,
* @param ... The arguments to use to fill out fmt.
* @note ap_log_rerror is implemented as a macro
* @note Use APLOG_MARK to fill out file, line, and module_index
- * @warning It is VERY IMPORTANT that you not include any raw data from
- * the network, such as the request-URI or request header fields, within
- * the format string. Doing so makes the server vulnerable to a
- * denial-of-service attack and other messy behavior. Instead, use a
- * simple format string like "%s", followed by the string containing the
+ * @warning It is VERY IMPORTANT that you not include any raw data from
+ * the network, such as the request-URI or request header fields, within
+ * the format string. Doing so makes the server vulnerable to a
+ * denial-of-service attack and other messy behavior. Instead, use a
+ * simple format string like "%s", followed by the string containing the
* untrusted data.
*/
#ifdef DOXYGEN
@@ -467,11 +467,11 @@ AP_DECLARE(void) ap_log_rerror_(const char *file, int line, int module_index,
* @note Use APLOG_MARK to fill out file, line, and module_index
* @note If a request_rec is available, use that with ap_log_rerror()
* in preference to calling this function.
- * @warning It is VERY IMPORTANT that you not include any raw data from
- * the network, such as the request-URI or request header fields, within
- * the format string. Doing so makes the server vulnerable to a
- * denial-of-service attack and other messy behavior. Instead, use a
- * simple format string like "%s", followed by the string containing the
+ * @warning It is VERY IMPORTANT that you not include any raw data from
+ * the network, such as the request-URI or request header fields, within
+ * the format string. Doing so makes the server vulnerable to a
+ * denial-of-service attack and other messy behavior. Instead, use a
+ * simple format string like "%s", followed by the string containing the
* untrusted data.
*/
#ifdef DOXYGEN
@@ -513,11 +513,11 @@ AP_DECLARE(void) ap_log_cerror_(const char *file, int line, int module_index,
* @note If a request_rec is available, use that with ap_log_rerror()
* in preference to calling this function. This function is mainly useful for
* modules like mod_ssl to use before the request_rec is created.
- * @warning It is VERY IMPORTANT that you not include any raw data from
- * the network, such as the request-URI or request header fields, within
- * the format string. Doing so makes the server vulnerable to a
- * denial-of-service attack and other messy behavior. Instead, use a
- * simple format string like "%s", followed by the string containing the
+ * @warning It is VERY IMPORTANT that you not include any raw data from
+ * the network, such as the request-URI or request header fields, within
+ * the format string. Doing so makes the server vulnerable to a
+ * denial-of-service attack and other messy behavior. Instead, use a
+ * simple format string like "%s", followed by the string containing the
* untrusted data.
*/
#ifdef DOXYGEN
@@ -588,7 +588,7 @@ typedef struct piped_log piped_log;
* @param p The pool to allocate out of
* @param program The program to run in the logging process
* @return The piped log structure
- * @note The log program is invoked as @p APR_PROGRAM_ENV,
+ * @note The log program is invoked as @p APR_PROGRAM_ENV,
* @see ap_open_piped_log_ex to modify this behavior
*/
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);
AP_DECLARE(apr_file_t *) ap_piped_log_write_fd(piped_log *pl);
/**
- * hook method to log error messages
+ * hook method to log error messages
* @ingroup hooks
* @param file The file in which this function is called
* @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);
* @param s The server which we are logging for
* @param r The request which we are logging for
* @param pool Memory pool to allocate from
- * @param errstr message to log
+ * @param errstr message to log
*/
AP_DECLARE_HOOK(void, error_log, (const char *file, int line,
int module_index, int level,
View
74 include/http_protocol.h
@@ -57,7 +57,7 @@ AP_DECLARE_DATA extern ap_filter_rec_t *ap_old_write_func;
* Read a request and fill in the fields.
* @param c The current connection
* @return The new request_rec
- */
+ */
request_rec *ap_read_request(conn_rec *c);
/**
@@ -87,10 +87,10 @@ AP_DECLARE(void) ap_finalize_request_protocol(request_rec *r);
/**
* Send error back to client.
* @param r The current request
- * @param recursive_error last arg indicates error status in case we get
- * an error in the process of trying to deal with an ErrorDocument
- * to handle some other error. In that case, we print the default
- * report for the first thing that went wrong, and more briefly report
+ * @param recursive_error last arg indicates error status in case we get
+ * an error in the process of trying to deal with an ErrorDocument
+ * to handle some other error. In that case, we print the default
+ * report for the first thing that went wrong, and more briefly report
* on the problem with the ErrorDocument.
*/
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);
AP_DECLARE(int) ap_set_keepalive(request_rec *r);
/**
- * Return the latest rational time from a request/mtime pair. Mtime is
+ * Return the latest rational time from a request/mtime pair. Mtime is
* returned unless it's in the future, in which case we return the current time.
* @param r The current request
* @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);
* @param r The current request
* @param type The content type
* @return The content-type
- */
+ */
AP_DECLARE(const char *) ap_make_content_type(request_rec *r,
const char *type);
@@ -152,7 +152,7 @@ AP_DECLARE(void) ap_setup_make_content_type(apr_pool_t *pool);
* @param force_weak Force the entity tag to be weak - it could be modified
* again in as short an interval.
* @return The entity tag
- */
+ */
AP_DECLARE(char *) ap_make_etag(request_rec *r, int force_weak);
/**
@@ -169,7 +169,7 @@ AP_DECLARE(void) ap_set_last_modified(request_rec *r);
/**
* Implements condition GET rules for HTTP/1.1 specification. This function
- * inspects the client headers and determines if the response fulfills
+ * inspects the client headers and determines if the response fulfills
* the requirements specified.
* @param r The current request
* @return OK if the response fulfills the condition GET rules, some
@@ -189,15 +189,15 @@ AP_DECLARE(int) ap_meets_conditions(request_rec *r);
*/
/**
- * Send an entire file to the client, using sendfile if supported by the
+ * Send an entire file to the client, using sendfile if supported by the
* current platform
* @param fd The file to send.
* @param r The current request
* @param offset Offset into the file to start sending.
* @param length Amount of data to send
* @param nbytes Amount of data actually sent
*/
-AP_DECLARE(apr_status_t) ap_send_fd(apr_file_t *fd, request_rec *r, apr_off_t offset,
+AP_DECLARE(apr_status_t) ap_send_fd(apr_file_t *fd, request_rec *r, apr_off_t offset,
apr_size_t length, apr_size_t *nbytes);
#if APR_HAS_MMAP
@@ -278,7 +278,7 @@ AP_DECLARE(int) ap_method_in_list(ap_method_list_t *l, const char *method);
* @return None.
*/
AP_DECLARE(void) ap_method_list_add(ap_method_list_t *l, const char *method);
-
+
/**
* Remove an HTTP method name from an ap_method_list_t structure.
*
@@ -296,12 +296,12 @@ AP_DECLARE(void) ap_method_list_remove(ap_method_list_t *l,
* @return None.
*/
AP_DECLARE(void) ap_clear_method_list(ap_method_list_t *l);
-
+
/**
- * Set the content type for this request (r->content_type).
+ * Set the content type for this request (r->content_type).
* @param r The current request
* @param ct The new content type
- * @warning This function must be called to set r->content_type in order
+ * @warning This function must be called to set r->content_type in order
* for the AddOutputFilterByType directive to work correctly.
*/
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);
*/
AP_DECLARE(int) ap_index_of_response(int status);
-/**
+/**
* Return the Status-Line for a given status code (excluding the
* HTTP-Version field). If an invalid or unknown status code is
- * passed, "500 Internal Server Error" will be returned.
+ * passed, "500 Internal Server Error" will be returned.
* @param status The HTTP status code
* @return The Status-Line
*/
@@ -403,7 +403,7 @@ AP_DECLARE(const char *) ap_get_status_line(int status);
/**
* Setup the client to allow Apache to read the request body.
* @param r The current request
- * @param read_policy How the server should interpret a chunked
+ * @param read_policy How the server should interpret a chunked
* transfer-encoding. One of: <pre>
* REQUEST_NO_BODY Send 413 error if message has any body
* 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);
AP_DECLARE(int) ap_setup_client_block(request_rec *r, int read_policy);
/**
- * Determine if the client has sent any data. This also sends a
+ * Determine if the client has sent any data. This also sends a
* 100 Continue response to HTTP/1.1 clients, so modules should not be called
* until the module is ready to read content.
* @warning Never call this function more than once.
@@ -442,25 +442,25 @@ AP_DECLARE(long) ap_get_client_block(request_rec *r, char *buffer, apr_size_t bu
* failing to read the request body would cause it to be interpreted
* as the next request on a persistent connection.
* @param r The current request
- * @return error status if request is malformed, OK otherwise
+ * @return error status if request is malformed, OK otherwise
*/
AP_DECLARE(int) ap_discard_request_body(request_rec *r);
/**
* Setup the output headers so that the client knows how to authenticate
* itself the next time, if an authentication request failed.
* @param r The current request
- */
+ */
AP_DECLARE(void) ap_note_auth_failure(request_rec *r);
/**
* @deprecated @see ap_note_auth_failure
- */
+ */
AP_DECLARE(void) ap_note_basic_auth_failure(request_rec *r);
/**
* @deprecated @see ap_note_auth_failure
- */
+ */
AP_DECLARE(void) ap_note_digest_auth_failure(request_rec *r);
/**
@@ -477,18 +477,18 @@ AP_DECLARE_HOOK(int, note_auth_failure, (request_rec *r, const char *auth_type))
* @param r The current request
* @param pw The password as set in the headers
* @return 0 (OK) if it set the 'pw' argument (and assured
- * a correct value in r->user); otherwise it returns
- * an error code, either HTTP_INTERNAL_SERVER_ERROR if things are
- * really confused, HTTP_UNAUTHORIZED if no authentication at all
- * seemed to be in use, or DECLINED if there was authentication but
- * it wasn't Basic (in which case, the caller should presumably
+ * a correct value in r->user); otherwise it returns
+ * an error code, either HTTP_INTERNAL_SERVER_ERROR if things are
+ * really confused, HTTP_UNAUTHORIZED if no authentication at all
+ * seemed to be in use, or DECLINED if there was authentication but
+ * it wasn't Basic (in which case, the caller should presumably
* decline as well).
*/
AP_DECLARE(int) ap_get_basic_auth_pw(request_rec *r, const char **pw);
/**
* parse_uri: break apart the uri
- * @warning Side Effects:
+ * @warning Side Effects:
* @li sets r->args to rest after '?' (or NULL if no '?')
* @li sets r->uri to request uri (without r->args part)
* @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);
/**
* Get the next line of input for the request
*
- * Note: on ASCII boxes, ap_rgetline is a macro which simply calls
+ * Note: on ASCII boxes, ap_rgetline is a macro which simply calls
* ap_rgetline_core to get the line of input.
- *
+ *
* on EBCDIC boxes, ap_rgetline is a wrapper function which
* translates ASCII protocol lines to the local EBCDIC code page
* after getting the line of input.
- *
+ *
* @param s Pointer to the pointer to the buffer into which the line
* should be read; if *s==NULL, a buffer of the necessary size
* 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);
* Other errors where appropriate
*/
#if APR_CHARSET_EBCDIC
-AP_DECLARE(apr_status_t) ap_rgetline(char **s, apr_size_t n,
+AP_DECLARE(apr_status_t) ap_rgetline(char **s, apr_size_t n,
apr_size_t *read,
request_rec *r, int fold,
apr_bucket_brigade *bb);
@@ -542,7 +542,7 @@ AP_DECLARE(apr_status_t) ap_rgetline(char **s, apr_size_t n,
#endif
/** @see ap_rgetline */
-AP_DECLARE(apr_status_t) ap_rgetline_core(char **s, apr_size_t n,
+AP_DECLARE(apr_status_t) ap_rgetline_core(char **s, apr_size_t n,
apr_size_t *read,
request_rec *r, int fold,
apr_bucket_brigade *bb);
@@ -591,7 +591,7 @@ AP_DECLARE_HOOK(void,pre_read_request,(request_rec *r, conn_rec *c))
* @return OK or DECLINED
*/
AP_DECLARE_HOOK(int,post_read_request,(request_rec *r))
-
+
/**
* This hook allows modules to perform any module-specific logging activities
* over and above the normal server things.
@@ -649,7 +649,7 @@ AP_DECLARE_DATA extern const apr_bucket_type_t ap_bucket_type_error;
/**
* Make the bucket passed in an error bucket
* @param b The bucket to make into an error bucket
- * @param error The HTTP error code to put in the bucket.
+ * @param error The HTTP error code to put in the bucket.
* @param buf An optional error string to put in the bucket.
* @param p A pool to allocate out of.
* @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,
/**
* Create a bucket referring to an HTTP error.
- * @param error The HTTP error code to put in the bucket.
+ * @param error The HTTP error code to put in the bucket.
* @param buf An optional error string to put in the bucket.
* @param p A pool to allocate the error string out of.
* @param list The bucket allocator from which to allocate the bucket
View
16 include/http_request.h
@@ -91,7 +91,7 @@ AP_DECLARE(request_rec *) ap_sub_req_lookup_file(const char *new_file,
const request_rec *r,
ap_filter_t *next_filter);
/**
- * Create a subrequest for the given apr_dir_read result. This subrequest
+ * Create a subrequest for the given apr_dir_read result. This subrequest
* can be inspected to find information about the requested file
* @param finfo The apr_dir_read result to lookup
* @param r The current request
@@ -103,7 +103,7 @@ AP_DECLARE(request_rec *) ap_sub_req_lookup_file(const char *new_file,
* @param next_filter The first filter the sub_request should use. If this is
* NULL, it defaults to the first filter for the main request
* @return The new request record
- * @note The apr_dir_read flags value APR_FINFO_MIN|APR_FINFO_NAME flag is the
+ * @note The apr_dir_read flags value APR_FINFO_MIN|APR_FINFO_NAME flag is the
* minimum recommended query if the results will be passed to apr_dir_read.
* The file info passed must include the name, and must have the same relative
* directory as the current request.
@@ -315,7 +315,7 @@ AP_DECLARE(void) ap_allow_standard_methods(request_rec *r, int reset, ...);
*/
void ap_process_request(request_rec *r);
-/* For post-processing after a handler has finished with a request.
+/* For post-processing after a handler has finished with a request.
* (Commonly used after it was suspended)
*/
AP_DECLARE(void) ap_process_request_after_handler(request_rec *r);
@@ -357,15 +357,15 @@ AP_DECLARE_HOOK(int,translate_name,(request_rec *r))
/**
* This hook allow modules to set the per_dir_config based on their own
- * context (such as "<Proxy>" sections) and responds to contextless requests
+ * context (such as "<Proxy>" sections) and responds to contextless requests
* such as TRACE that need no security or filesystem mapping.
* based on the filesystem.
* @param r The current request
- * @return DONE (or HTTP_) if this contextless request was just fulfilled
+ * @return DONE (or HTTP_) if this contextless request was just fulfilled
* (such as TRACE), OK if this is not a file, and DECLINED if this is a file.
* The core map_to_storage (HOOK_RUN_REALLY_LAST) will directory_walk
* and file_walk the r->filename.
- *
+ *
* @ingroup hooks
*/
AP_DECLARE_HOOK(int,map_to_storage,(request_rec *r))
@@ -394,7 +394,7 @@ AP_DECLARE_HOOK(int,check_user_id,(request_rec *r))
* @ingroup hooks
*/
AP_DECLARE_HOOK(int,fixups,(request_rec *r))
-
+
/**
* This routine is called to determine and/or set the various document type
* information bits, like Content-type (via r->content_type), language, et
@@ -467,7 +467,7 @@ AP_DECLARE(void) ap_hook_check_access(ap_HOOK_access_checker_t *pf,
int nOrder, int type);
/**
- * Register a hook function that will apply additional access control
+ * Register a hook function that will apply additional access control
* and/or bypass authentication for the current request.
* @param pf An access_checker_ex hook function
* @param aszPre A NULL-terminated array of strings that name modules whose
View
14 include/http_vhost.h
@@ -37,7 +37,7 @@ extern "C" {
AP_DECLARE(void) ap_init_vhost_config(apr_pool_t *p);
/**
- * called after the config has been read to compile the tables needed to do
+ * called after the config has been read to compile the tables needed to do
* the run-time vhost lookups
* @param p The pool to allocate out of
* @param main_server The start of the virtual host list
@@ -53,7 +53,7 @@ AP_DECLARE(void) ap_fini_vhost_config(apr_pool_t *p, server_rec *main_server);
const char *ap_parse_vhost_addrs(apr_pool_t *p, const char *hostname, server_rec *s);
/**
- * handle NameVirtualHost directive
+ * handle NameVirtualHost directive
* @param cmd Command Parameters structure
* @param dummy NOT USED
* @param arg a host of the form "<address>[:port]"
@@ -71,29 +71,29 @@ AP_DECLARE_NONSTD(const char *)ap_set_name_virtual_host(cmd_parms *cmd,
* @return 0 on success, any non-zero return will stop the iteration.
*/
typedef int(*ap_vhost_iterate_conn_cb)(void* baton, conn_rec* conn, server_rec* s);
-
+
/**
* For every virtual host on this connection, call func_cb.
* @param conn The current connection
- * @param func_cb Function called for every Name Based Virtual Host for this
+ * @param func_cb Function called for every Name Based Virtual Host for this
* connection.
* @param baton Opaque object passed to func_cb.
* @return The return value from func_cb.
- * @note If func_cb returns non-zero, the function will return at this point,
+ * @note If func_cb returns non-zero, the function will return at this point,
* and not continue iterating the virtual hosts.
*/
AP_DECLARE(int) ap_vhost_iterate_given_conn(conn_rec *conn,
ap_vhost_iterate_conn_cb func_cb,
void* baton);
/**
- * given an ip address only, give our best guess as to what vhost it is
+ * given an ip address only, give our best guess as to what vhost it is
* @param conn The current connection
*/
AP_DECLARE(void) ap_update_vhost_given_ip(conn_rec *conn);
/**
- * ap_update_vhost_given_ip is never enough, and this is always called after
+ * ap_update_vhost_given_ip is never enough, and this is always called after
* the headers have been read. It may change r->server.
* @param r The current request
*/
View
160 include/httpd.h
@@ -90,15 +90,15 @@ extern "C" {
#endif
#endif /* HTTPD_ROOT */
-/*
+/*
* --------- You shouldn't have to edit anything below this line ----------
*
- * Any modifications to any defaults not defined above should be done in the
- * respective configuration file.
+ * Any modifications to any defaults not defined above should be done in the
+ * respective configuration file.
*
*/
-/**
+/**
* Default location of documents. Can be overridden by the DocumentRoot
* directive.
*/
@@ -156,7 +156,7 @@ extern "C" {
/** The timeout for waiting for messages */
#ifndef DEFAULT_TIMEOUT
-#define DEFAULT_TIMEOUT 300
+#define DEFAULT_TIMEOUT 300
#endif
/** The timeout for waiting for keepalive timeout until next request */
@@ -190,15 +190,15 @@ extern "C" {
/** default limit on bytes in Request-Line (Method+URI+HTTP-version) */
#ifndef DEFAULT_LIMIT_REQUEST_LINE
#define DEFAULT_LIMIT_REQUEST_LINE 8190
-#endif
+#endif
/** default limit on bytes in any one header field */
#ifndef DEFAULT_LIMIT_REQUEST_FIELDSIZE
#define DEFAULT_LIMIT_REQUEST_FIELDSIZE 8190
-#endif
+#endif
/** default limit on number of request header fields */
#ifndef DEFAULT_LIMIT_REQUEST_FIELDS
#define DEFAULT_LIMIT_REQUEST_FIELDS 100
-#endif
+#endif
/**
* The default default character set name to add if AddDefaultCharset is
@@ -303,8 +303,8 @@ extern "C" {
#define AP_MAX_REG_MATCH 10
/**
- * APR_HAS_LARGE_FILES introduces the problem of spliting sendfile into
- * mutiple buckets, no greater than MAX(apr_size_t), and more granular
+ * APR_HAS_LARGE_FILES introduces the problem of spliting sendfile into
+ * mutiple buckets, no greater than MAX(apr_size_t), and more granular
* than that in case the brigade code/filters attempt to read it directly.
* ### 16mb is an invention, no idea if it is reasonable.
*/
@@ -313,21 +313,21 @@ extern "C" {
/**
* Special Apache error codes. These are basically used
* in http_main.c so we can keep track of various errors.
- *
+ *
*/
/** a normal exit */
#define APEXIT_OK 0x0
/** A fatal error arising during the server's init sequence */
#define APEXIT_INIT 0x2
/** The child died during its init sequence */
#define APEXIT_CHILDINIT 0x3
-/**
+/**
* The child exited due to a resource shortage.
* The parent should limit the rate of forking until
* the situation is resolved.
*/
#define APEXIT_CHILDSICK 0x7
-/**
+/**
* A fatal error, resulting in the whole server aborting.
* If a child exits with this error, the parent process
* considers this a server-wide fatal error and aborts.
@@ -384,9 +384,9 @@ extern "C" {
# define AP_CORE_DECLARE_NONSTD AP_DECLARE_NONSTD
#endif
-/**
- * @brief The numeric version information is broken out into fields within this
- * structure.
+/**
+ * @brief The numeric version information is broken out into fields within this
+ * structure.
*/
typedef struct {
int major; /**< major number */
@@ -437,10 +437,10 @@ AP_DECLARE(const char *) ap_get_server_built(void);
#define OK 0 /**< Module has handled this stage. */
#define DECLINED -1 /**< Module declines to handle */
-#define DONE -2 /**< Module has served the response completely
+#define DONE -2 /**< Module has served the response completely
* - it's safe to die() with no more output
*/
-#define SUSPENDED -3 /**< Module will handle the remainder of the request.
+#define SUSPENDED -3 /**< Module will handle the remainder of the request.
* The core will never invoke the request again, */
/** Returned by the bottom-most filter if no data was written.
@@ -602,9 +602,9 @@ typedef struct ap_method_list_t ap_method_list_t;
/**
* @struct ap_method_list_t
- * @brief Structure for handling HTTP methods.
+ * @brief Structure for handling HTTP methods.
*
- * Methods known to the server are accessed via a bitmask shortcut;
+ * Methods known to the server are accessed via a bitmask shortcut;
* extension methods are handled by an array.
*/
struct ap_method_list_t {
@@ -646,12 +646,12 @@ struct ap_method_list_t {
#define CR '\r'
#define LF '\n'
#define CRLF "\r\n"
-#endif /* APR_CHARSET_EBCDIC */
+#endif /* APR_CHARSET_EBCDIC */
/** Useful for common code with either platform charset. */
#define CRLF_ASCII "\015\012"
/**
- * @defgroup values_request_rec_body Possible values for request_rec.read_body
+ * @defgroup values_request_rec_body Possible values for request_rec.read_body
* @{
* Possible values for request_rec.read_body (set by handling module):
*/
@@ -665,7 +665,7 @@ struct ap_method_list_t {
/** @} // values_request_rec_body */
/**
- * @defgroup values_request_rec_used_path_info Possible values for request_rec.used_path_info
+ * @defgroup values_request_rec_used_path_info Possible values for request_rec.used_path_info
* @ingroup APACHE_CORE_DAEMON
* @{
* Possible values for request_rec.used_path_info:
@@ -737,8 +737,8 @@ typedef struct conn_state_t conn_state_t;
/* This comes after we have defined the request_rec type */
#include "apr_uri.h"
-/**
- * @brief A structure that represents one process
+/**
+ * @brief A structure that represents one process
*/
struct process_rec {
/** Global pool. Cleared upon normal exit */
@@ -753,8 +753,8 @@ struct process_rec {
int argc;
};
-/**
- * @brief A structure that represents the current request
+/**
+ * @brief A structure that represents the current request
*/
struct request_rec {
/** The pool associated with the request */
@@ -833,9 +833,9 @@ struct request_rec {
*/
apr_int64_t allowed;
/** Array of extension methods */
- apr_array_header_t *allowed_xmethods;
+ apr_array_header_t *allowed_xmethods;
/** List of allowed methods */
- ap_method_list_t *allowed_methods;
+ ap_method_list_t *allowed_methods;
/** byte count in stream is for body */
apr_off_t sent_bodyct;
@@ -896,7 +896,7 @@ struct request_rec {
/** Notes from one module to another */
apr_table_t *notes;
- /* content_type, handler, content_encoding, and all content_languages
+ /* content_type, handler, content_encoding, and all content_languages
* MUST be lowercased strings. They may be pointers to static strings;
* they should not be modified in place.
*/
@@ -912,9 +912,9 @@ struct request_rec {
/** variant list validator (if negotiated) */
char *vlist_validator;
-
+
/** If an authentication check was made, this gets set to the user name. */
- char *user;
+ char *user;
/** If an authentication check was made, this gets set to the auth type. */
char *ap_auth_type;
@@ -923,7 +923,7 @@ struct request_rec {
*/
/** The URI without any parsing performed */
- char *unparsed_uri;
+ char *unparsed_uri;
/** The path portion of the URI, or "/" if no path provided */
char *uri;
/** The filename on disk corresponding to this response */
@@ -934,12 +934,12 @@ struct request_rec {
/** The PATH_INFO extracted from this request */
char *path_info;
/** The QUERY_ARGS extracted from this request */
- char *args;
+ char *args;
/**
- * Flag for the handler to accept or reject path_info on
+ * Flag for the handler to accept or reject path_info on
* the current request. All modules should respect the
- * AP_REQ_ACCEPT_PATH_INFO and AP_REQ_REJECT_PATH_INFO
+ * AP_REQ_ACCEPT_PATH_INFO and AP_REQ_REJECT_PATH_INFO
* values, while AP_REQ_DEFAULT_PATH_INFO indicates they
* may follow existing conventions. This is set to the
* user's preference upon HOOK_VERY_FIRST of the fixups.
@@ -1031,8 +1031,8 @@ typedef enum {
AP_CONN_KEEPALIVE
} ap_conn_keepalive_e;
-/**
- * @brief Structure to store things which are per connection
+/**
+ * @brief Structure to store things which are per connection
*/
struct conn_rec {
/** Pool associated with this connection */
@@ -1065,7 +1065,7 @@ struct conn_rec {
char *local_host;
/** ID of this connection; unique at any point in time */
- long id;
+ long id;
/** Config vector containing pointers to connections per-server
* config structures. */
struct ap_conf_vector_t *conn_config;
@@ -1082,7 +1082,7 @@ struct conn_rec {
struct apr_bucket_alloc_t *bucket_alloc;
/** The current state of this connection */
conn_state_t *cs;
- /** Is there data pending in the input filters? */
+ /** Is there data pending in the input filters? */
int data_in_input_filters;
/** Is there data pending in the output filters? */
int data_in_output_filters;
@@ -1091,8 +1091,8 @@ struct conn_rec {
* the event mpm.
*/
unsigned int clogging_input_filters:1;
-
- /** have we done double-reverse DNS? -1 yes/failure, 0 not yet,
+
+ /** have we done double-reverse DNS? -1 yes/failure, 0 not yet,
* 1 yes/success */
signed int double_reverse:2;
@@ -1126,8 +1126,8 @@ struct conn_rec {
#endif
};
-/**
- * Enumeration of connection states
+/**
+ * Enumeration of connection states
*/
typedef enum {
CONN_STATE_CHECK_REQUEST_LINE_READABLE,
@@ -1140,8 +1140,8 @@ typedef enum {
CONN_STATE_LINGER_SHORT
} conn_state_e;
-/**
- * @brief A structure to contain connection state information
+/**
+ * @brief A structure to contain connection state information
*/
struct conn_state_t {
/** APR_RING of expiration timeouts */
@@ -1171,7 +1171,7 @@ struct conn_state_t {
/**
* @struct server_addr_rec
- * @brief A structure to be used for Per-vhost config
+ * @brief A structure to be used for Per-vhost config
*/
typedef struct server_addr_rec server_addr_rec;
struct server_addr_rec {
@@ -1192,8 +1192,8 @@ struct ap_logconf {
/** The log level for this server */
int level;
};
-/**
- * @brief A structure to store information for each virtual server
+/**
+ * @brief A structure to store information for each virtual server
*/
struct server_rec {
/** The process this server is running in */
@@ -1212,9 +1212,9 @@ struct server_rec {
/* Module-specific configuration for server, and defaults... */
- /** Config vector containing pointers to modules' per-server config
+ /** Config vector containing pointers to modules' per-server config
* structures. */
- struct ap_conf_vector_t *module_config;
+ struct ap_conf_vector_t *module_config;
/** MIME type info, etc., before we start checking per-directory info */
struct ap_conf_vector_t *lookup_defaults;
@@ -1268,7 +1268,7 @@ struct server_rec {
/** limit on size of any request header field */
int limit_req_fieldsize;
/** limit on number of request header fields */
- int limit_req_fields;
+ int limit_req_fields;
/** Opaque storage location */
@@ -1282,19 +1282,19 @@ typedef struct core_output_filter_ctx {
apr_size_t bytes_in;
apr_size_t bytes_written;
} core_output_filter_ctx_t;
-
+
typedef struct core_filter_ctx {
apr_bucket_brigade *b;
apr_bucket_brigade *tmpbb;
} core_ctx_t;
-
+
typedef struct core_net_rec {
/** Connection to the client */
apr_socket_t *client_socket;
/** connection record */
conn_rec *c;
-
+
core_output_filter_ctx_t *out_ctx;
core_ctx_t *in_ctx;
} core_net_rec;
@@ -1445,34 +1445,34 @@ AP_DECLARE(char *) ap_getword_conf_nc(apr_pool_t *p, char **line);
* @param word The string to check
* @return The string with the replaced environment variables
*/
-AP_DECLARE(const char *) ap_resolve_env(apr_pool_t *p, const char * word);
+AP_DECLARE(const char *) ap_resolve_env(apr_pool_t *p, const char * word);
/**
* Size an HTTP header field list item, as separated by a comma.
* @param field The field to size
* @param len The length of the field
- * @return The return value is a pointer to the beginning of the non-empty
- * list item within the original string (or NULL if there is none) and the
- * address of field is shifted to the next non-comma, non-whitespace
+ * @return The return value is a pointer to the beginning of the non-empty
+ * list item within the original string (or NULL if there is none) and the
+ * address of field is shifted to the next non-comma, non-whitespace
* character. len is the length of the item excluding any beginning whitespace.
*/
AP_DECLARE(const char *) ap_size_list_item(const char **field, int *len);
/**
* Retrieve an HTTP header field list item, as separated by a comma,
* while stripping insignificant whitespace and lowercasing anything not in
- * a quoted string or comment.
+ * a quoted string or comment.
* @param p The pool to allocate from
* @param field The field to retrieve
- * @return The return value is a new string containing the converted list
- * item (or NULL if none) and the address pointed to by field is
+ * @return The return value is a new string containing the converted list
+ * item (or NULL if none) and the address pointed to by field is
* shifted to the next non-comma, non-whitespace.
*/
AP_DECLARE(char *) ap_get_list_item(apr_pool_t *p, const char **field);
/**
* Find an item in canonical form (lowercase, no extra spaces) within
- * an HTTP field value list.
+ * an HTTP field value list.
* @param p The pool to allocate from
* @param line The field value list to search
* @param tok The token to search for
@@ -1493,7 +1493,7 @@ AP_DECLARE(int) ap_find_list_item(apr_pool_t *p, const char *line, const char *t
AP_DECLARE(char *) ap_get_token(apr_pool_t *p, const char **accept_line, int accept_white);
/**
- * Find http tokens, see the definition of token from RFC2068
+ * Find http tokens, see the definition of token from RFC2068
* @param p The pool to allocate from
* @param line The line to find the token
* @param tok The token to find
@@ -1649,7 +1649,7 @@ AP_DECLARE(int) ap_count_dirs(const char *path);
* @param s The location to copy from
* @param n The number of directories to copy
* @return value is the ever useful pointer to the trailing "\0" of d
- * @note on platforms with drive letters, n = 0 returns the "/" root,
+ * @note on platforms with drive letters, n = 0 returns the "/" root,
* whereas n = 1 returns the "d:/" root. On all other platforms, n = 0
* returns the empty string. */
AP_DECLARE(char *) ap_make_dirstr_prefix(char *d, const char *s, int n);
@@ -1745,7 +1745,7 @@ AP_DECLARE(char *) ap_pbase64decode(apr_pool_t *p, const char *bufcoded);
* @param string The plaintext string
* @return The encoded string
*/
-AP_DECLARE(char *) ap_pbase64encode(apr_pool_t *p, char *string);
+AP_DECLARE(char *) ap_pbase64encode(apr_pool_t *p, char *string);
/**
* Compile a regular expression to be used later. The regex is freed when
@@ -1773,11 +1773,11 @@ AP_DECLARE(ap_regex_t *) ap_pregcomp(apr_pool_t *p, const char *pattern,
AP_DECLARE(void) ap_pregfree(apr_pool_t *p, ap_regex_t *reg);
/**
- * After performing a successful regex match, you may use this function to
+ * After performing a successful regex match, you may use this function to
* perform a series of string substitutions based on subexpressions that were
* matched during the call to ap_regexec
* @param p The pool to allocate from
- * @param input An arbitrary string containing $1 through $9. These are
+ * @param input An arbitrary string containing $1 through $9. These are
* replaced with the corresponding matched sub-expressions
* @param source The string that was originally matched to the regex
* @param nmatch the nmatch returned from ap_pregex
@@ -1796,18 +1796,18 @@ AP_DECLARE(void) ap_content_type_tolower(char *s);
/**
* convert a string to all lowercase
- * @param s The string to convert to lowercase
+ * @param s The string to convert to lowercase
*/
AP_DECLARE(void) ap_str_tolower(char *s);
/**
* convert a string to all uppercase
- * @param s The string to convert to uppercase
+ * @param s The string to convert to uppercase
*/
AP_DECLARE(void) ap_str_toupper(char *s);
/**
- * Search a string from left to right for the first occurrence of a
+ * Search a string from left to right for the first occurrence of a
* specific character
* @param str The string to search
* @param c The character to search for
@@ -1816,7 +1816,7 @@ AP_DECLARE(void) ap_str_toupper(char *s);
AP_DECLARE(int) ap_ind(const char *str, char c); /* Sigh... */
/**
- * Search a string from right to left for the first occurrence of a
+ * Search a string from right to left for the first occurrence of a
* specific character
* @param str The string to search
* @param c The character to search for
@@ -1828,7 +1828,7 @@ AP_DECLARE(int) ap_rind(const char *str, char c);
* Given a string, replace any bare &quot; with \\&quot; .
* @param p The pool to allocate memory from
* @param instring The string to search for &quot;
- * @return A copy of the string with escaped quotes
+ * @return A copy of the string with escaped quotes
*/
AP_DECLARE(char *) ap_escape_quotes(apr_pool_t *p, const char *instring);
@@ -1840,7 +1840,7 @@ AP_DECLARE(char *) ap_escape_quotes(apr_pool_t *p, const char *instring);
* @param p The pool to allocate memory from
* @param string The string to append the PID to
* @param delim The string to use to deliminate the string from the PID
- * @return A copy of the string with the PID appended
+ * @return A copy of the string with the PID appended
*/
AP_DECLARE(char *) ap_append_pid(apr_pool_t *p, const char *string,
const char *delim);
@@ -1875,7 +1875,7 @@ AP_DECLARE(apr_status_t) ap_timeout_parameter_parse(
* @return truth value
*/
AP_DECLARE(int) ap_request_has_body(request_rec *r);
-
+
/**
* Cleanup a string (mainly to be filesystem safe)
* We only allow '_' and alphanumeric chars. Non-printable
@@ -1903,7 +1903,7 @@ AP_DECLARE(apr_status_t) ap_str2_alnum(const char *src, char *dest);
/**
* Structure to store the contents of an HTTP form of the type
* application/x-www-form-urlencoded.
- *
+ *
* Currently it contains the name as a char* of maximum length
* HUGE_STRING_LEN, and a value in the form of a bucket brigade
* of arbitrary length.
@@ -1930,15 +1930,15 @@ AP_DECLARE(int) ap_parse_form_data(request_rec *r, struct ap_filter_t *f,
/* Misc system hackery */
/**
* Given the name of an object in the file system determine if it is a directory
- * @param p The pool to allocate from
+ * @param p The pool to allocate from
* @param name The name of the object to check
* @return 1 if it is a directory, 0 otherwise
*/
AP_DECLARE(int) ap_is_rdirectory(apr_pool_t *p, const char *name);
/**
* Given the name of an object in the file system determine if it is a directory - this version is symlink aware
- * @param p The pool to allocate from
+ * @param p The pool to allocate from
* @param name The name of the object to check
* @return 1 if it is a directory, 0 otherwise
*/
@@ -1964,7 +1964,7 @@ char *ap_get_local_host(apr_pool_t *p);
AP_DECLARE(void) ap_log_assert(const char *szExp, const char *szFile, int nLine)
__attribute__((noreturn));
-/**
+/**
* @internal Internal Assert function
*/
#define ap_assert(exp) ((exp) ? (void)0 : ap_log_assert(#exp,__FILE__,__LINE__))
@@ -2029,7 +2029,7 @@ AP_DECLARE(const char *) ap_psignature(const char *prefix, request_rec *r);
these macros detect the drop in maintainer mode, but use the native
methods for normal builds
- Note that on some platforms (e.g., AIX with gcc, Solaris with gcc), string.h needs
+ Note that on some platforms (e.g., AIX with gcc, Solaris with gcc), string.h needs
to be included before the macros are defined or compilation will fail.
*/
#include <string.h>
View
2 include/mod_core.h
@@ -71,7 +71,7 @@ char *ap_response_code_string(request_rec *r, int error_index);
* @fn void ap_basic_http_header(request_rec *r, apr_bucket_brigade *bb)
*/
AP_DECLARE(void) ap_basic_http_header(request_rec *r, apr_bucket_brigade *bb);
-
+
/**
* Send an appropriate response to an http TRACE request.
* @param r The current request
View
16 include/mpm_common.h
@@ -55,14 +55,14 @@ extern "C" {
* by listen(2). Under some systems, it should be increased if you
* are experiencing a heavy TCP SYN flood attack.
*
- * It defaults to 511 instead of 512 because some systems store it
- * as an 8-bit datatype; 512 truncated to 8-bits is 0, while 511 is
+ * It defaults to 511 instead of 512 because some systems store it
+ * as an 8-bit datatype; 512 truncated to 8-bits is 0, while 511 is
* 255 when truncated.
*/
#ifndef DEFAULT_LISTENBACKLOG
#define DEFAULT_LISTENBACKLOG 511
#endif
-
+
/* Signal used to gracefully restart */
#define AP_SIG_GRACEFUL SIGUSR1
@@ -114,7 +114,7 @@ void ap_reclaim_child_processes(int terminate,
void ap_relieve_child_processes(ap_reclaim_callback_fn_t *mpm_callback);
/**
- * Tell ap_reclaim_child_processes() and ap_relieve_child_processes() about
+ * Tell ap_reclaim_child_processes() and ap_relieve_child_processes() about
* an MPM child process which has no entry in the scoreboard.
* @param pid The process id of an MPM child process which should be
* reclaimed when ap_reclaim_child_processes() is called.
@@ -151,13 +151,13 @@ apr_status_t ap_mpm_safe_kill(pid_t pid, int sig);
* Run the monitor hook (once every ten calls), determine if any child
* process has died and, if none died, sleep one second.
* @param status The return code if a process has died
- * @param exitcode The returned exit status of the child, if a child process
+ * @param exitcode The returned exit status of the child, if a child process
* dies, or the signal that caused the child to die.
* @param ret The process id of the process that died
* @param p The pool to allocate out of
* @param s The server_rec to pass
*/
-void ap_wait_or_timeout(apr_exit_why_e *status, int *exitcode, apr_proc_t *ret,
+void ap_wait_or_timeout(apr_exit_why_e *status, int *exitcode, apr_proc_t *ret,
apr_pool_t *p, server_rec *s);
/**
@@ -207,7 +207,7 @@ AP_DECLARE(gid_t) ap_gname2id(const char *name);
/**
* The initgroups() function initializes the group access list by reading the
* group database /etc/group and using all groups of which user is a member.
- * The additional group basegid is also added to the list.
+ * The additional group basegid is also added to the list.
* @param name The user name - must be non-NULL
* @param basegid The basegid to add
* @return returns 0 on success
@@ -362,7 +362,7 @@ AP_DECLARE_HOOK(const char *,mpm_get_name,(void))
* core's pre-config hook
*/
void mpm_common_pre_config(apr_pool_t *pconf);
-
+
#ifdef __cplusplus
}
#endif
View
10 include/scoreboard.h
@@ -43,7 +43,7 @@ extern "C" {
#define DEFAULT_SCOREBOARD "logs/apache_runtime_status"
#endif
-/* Scoreboard info on a process is, for now, kept very brief ---
+/* Scoreboard info on a process is, for now, kept very brief ---
* just status value and pid (the latter so that the caretaker process
* can properly update the scoreboard when a process dies). We may want
* to eventually add a separate set of long_score structures which would