diff options
author | Jim Jagielski <jim@apache.org> | 2011-09-23 13:38:09 +0000 |
---|---|---|
committer | Jim Jagielski <jim@apache.org> | 2011-09-23 13:38:09 +0000 |
commit | 103f776c25b7fdd51da4f98643b8dcdb09efdce6 (patch) | |
tree | a180a9a0f13da4a983913f50a3ad1a7e2f2a675a /modules | |
parent | 69c1a5c854b89a80cf5ca08b7b38d9f0a88c2667 (diff) | |
download | httpd-103f776c25b7fdd51da4f98643b8dcdb09efdce6.tar.gz |
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
Diffstat (limited to 'modules')
28 files changed, 157 insertions, 157 deletions
diff --git a/modules/aaa/mod_authz_dbd.h b/modules/aaa/mod_authz_dbd.h index 1aed4e6a81..5d55a8eec1 100644 --- a/modules/aaa/mod_authz_dbd.h +++ b/modules/aaa/mod_authz_dbd.h @@ -18,7 +18,7 @@ #define MOD_AUTHZ_DBD_H #include "httpd.h" -/* Create a set of AUTHZ_DBD_DECLARE(type), AUTHZ_DBD_DECLARE_NONSTD(type) and +/* Create a set of AUTHZ_DBD_DECLARE(type), AUTHZ_DBD_DECLARE_NONSTD(type) and * AUTHZ_DBD_DECLARE_DATA with appropriate export and import tags */ #if !defined(WIN32) diff --git a/modules/arch/unix/mod_unixd.h b/modules/arch/unix/mod_unixd.h index f377bd2b87..a7f439e643 100644 --- a/modules/arch/unix/mod_unixd.h +++ b/modules/arch/unix/mod_unixd.h @@ -16,7 +16,7 @@ /** * @file mod_unixd.h - * @brief common stuff that unix MPMs will want + * @brief common stuff that unix MPMs will want * * @addtogroup APACHE_OS_UNIX * @{ diff --git a/modules/arch/win32/mod_isapi.h b/modules/arch/win32/mod_isapi.h index dcef4fc73a..7aa2b55dda 100644 --- a/modules/arch/win32/mod_isapi.h +++ b/modules/arch/win32/mod_isapi.h @@ -48,24 +48,24 @@ typedef int (APR_THREAD_FUNC *PFN_GETEXTENSIONVERSION)(HSE_VERSION_INFO *ver_inf typedef struct isapi_cid isapi_cid; typedef struct isapi_cid *HCONN; -/* Prototypes of the essential functions exposed by mod_isapi +/* Prototypes of the essential functions exposed by mod_isapi * for the module to communicate with Apache. */ -typedef int (APR_THREAD_FUNC +typedef int (APR_THREAD_FUNC *PFN_GETSERVERVARIABLE)(HCONN cid, char *variable_name, void *buf_data, apr_uint32_t *buf_size); -typedef int (APR_THREAD_FUNC - *PFN_WRITECLIENT)(HCONN cid, +typedef int (APR_THREAD_FUNC + *PFN_WRITECLIENT)(HCONN cid, void *buf_data, apr_uint32_t *buf_size, apr_uint32_t flags); -typedef int (APR_THREAD_FUNC - *PFN_READCLIENT)(HCONN cid, +typedef int (APR_THREAD_FUNC + *PFN_READCLIENT)(HCONN cid, void *buf_data, apr_uint32_t *buf_size); -typedef int (APR_THREAD_FUNC +typedef int (APR_THREAD_FUNC *PFN_SERVERSUPPORTFUNCTION)(HCONN cid, apr_uint32_t HSE_code, void *buf_data, @@ -95,14 +95,14 @@ typedef struct EXTENSION_CONTROL_BLOCK { PFN_SERVERSUPPORTFUNCTION ServerSupportFunction; } EXTENSION_CONTROL_BLOCK; -/* Status/Headers structure to pass to HSE_SEND_HEADER_EX, +/* Status/Headers structure to pass to HSE_SEND_HEADER_EX, * an MS extension to ServerSupportFunction */ typedef struct HSE_SEND_HEADER_EX_INFO { const char * pszStatus; /* HTTP status text, such as "200 OK" */ const char * pszHeader; /* HTTP header lines text, such as * "Content-type: text/plain\r\n" - * "Content-Language: en\r\n" + * "Content-Language: en\r\n" * Note that (in spite of cchFoo lengths below) * NULL characters will interfere in headers. */ @@ -124,7 +124,7 @@ typedef struct HSE_SEND_HEADER_EX_INFO { * relation to Apache; the rules that the Apache server obeys follow * its own design and HTTP protocol filter rules. * - * We do not support async, however, we fake it. If HSE_IO_SYNC is + * We do not support async, however, we fake it. If HSE_IO_SYNC is * not passed, and a completion context was defined, we will invoke the * completion function immediately following the transfer, and then * return to the caller. If HSE_IO_SYNC is passed, there is no call @@ -135,7 +135,7 @@ typedef struct HSE_SEND_HEADER_EX_INFO { #define HSE_IO_DISCONNECT_AFTER_SEND 4 #define HSE_IO_NODELAY 4096 -/* The Completion function prototype. This callback may be fixed with +/* The Completion function prototype. This callback may be fixed with * the HSE_REQ_IO_COMPLETION ServerSupportFunction call, or overriden * for the HSE_REQ_TRANSMIT_FILE call. */ @@ -153,7 +153,7 @@ typedef struct HSE_TF_INFO { */ void *pContext; apr_os_file_t hFile; /* HANDLE/fd to transmit */ - const char *pszStatusCode; /* Ignored if HSE_IO_SEND_HEADERS is + const char *pszStatusCode; /* Ignored if HSE_IO_SEND_HEADERS is * not set. Includes HTTP status text * plus header text lines, such as * "200 OK\r\n" @@ -182,7 +182,7 @@ typedef struct HSE_URL_MAPEX_INFO { #define HSE_REQ_SEND_URL 2 #define HSE_REQ_SEND_RESPONSE_HEADER 3 #define HSE_REQ_DONE_WITH_SESSION 4 - + /* MS Extented methods to ISAPI ServerSupportFunction() HSE_code */ #define HSE_REQ_MAP_URL_TO_PATH 1001 /* Emulated */ #define HSE_REQ_GET_SSPI_INFO 1002 /* Not Supported */ @@ -203,13 +203,13 @@ typedef struct HSE_URL_MAPEX_INFO { #define HSE_REQ_IS_CONNECTED 1018 /* Supported */ #define HSE_REQ_EXTENSION_TRIGGER 1020 /* Not Supported */ -/* The request entry point that must be exported by every ISAPI handler +/* The request entry point that must be exported by every ISAPI handler */ apr_uint32_t APR_THREAD_FUNC HttpExtensionProc(EXTENSION_CONTROL_BLOCK *ecb); -typedef apr_uint32_t (APR_THREAD_FUNC +typedef apr_uint32_t (APR_THREAD_FUNC *PFN_HTTPEXTENSIONPROC)(EXTENSION_CONTROL_BLOCK *ecb); -/* Allowable return values from HttpExtensionProc (apparently 0 is also +/* Allowable return values from HttpExtensionProc (apparently 0 is also * accepted by MS IIS, and we will respect it as Success.) * If the HttpExtensionProc returns HSE_STATUS_PENDING, we will create * a wait mutex and lock on it, until HSE_REQ_DONE_WITH_SESSION is called. @@ -246,10 +246,10 @@ typedef apr_uint32_t (APR_THREAD_FUNC #define HSE_TERM_ADVISORY_UNLOAD 2 /* The shutdown entry point óptionally exported by an ISAPI handler, passed - * HSE_TERM_MUST_UNLOAD or HSE_TERM_ADVISORY_UNLOAD. The module may return + * HSE_TERM_MUST_UNLOAD or HSE_TERM_ADVISORY_UNLOAD. The module may return * if passed HSE_TERM_ADVISORY_UNLOAD, and the module will remain loaded. - * If the module returns 1 to HSE_TERM_ADVISORY_UNLOAD it is immediately - * unloaded. If the module is passed HSE_TERM_MUST_UNLOAD, its return value + * If the module returns 1 to HSE_TERM_ADVISORY_UNLOAD it is immediately + * unloaded. If the module is passed HSE_TERM_MUST_UNLOAD, its return value * is ignored. */ int APR_THREAD_FUNC TerminateExtension(apr_uint32_t flags); diff --git a/modules/cache/cache_cache.h b/modules/cache/cache_cache.h index e805cf206c..9532a98d3e 100644 --- a/modules/cache/cache_cache.h +++ b/modules/cache/cache_cache.h @@ -57,7 +57,7 @@ typedef void cache_cache_free(void *a); * @param key_entry callback to get the key of a entry * @param free_entry callback to free an entry */ -cache_cache_t* cache_init(int max_entries, +cache_cache_t* cache_init(int max_entries, apr_size_t max_size, cache_pqueue_get_priority get_pri, cache_pqueue_set_priority set_pri, @@ -79,13 +79,13 @@ void cache_free(cache_cache_t *c); * @param key the key */ void* cache_find(cache_cache_t* c, const char *key); -/** +/** * insert a entry into the cache * @param c the cache * @param entry the entry */ void cache_update(cache_cache_t* c, void *entry); -/** +/** * insert a entry into the cache * @param c the cache * @param entry the entry @@ -97,8 +97,8 @@ void cache_insert(cache_cache_t* c, void *entry); * @returns the entry or NULL */ void* cache_pop(cache_cache_t* c); -/** - * remove an item from the cache +/** + * remove an item from the cache * @param c the cache * @param entry the actual entry (from a find) */ diff --git a/modules/cache/cache_hash.h b/modules/cache/cache_hash.h index 37ae3e65c3..46f3a76b55 100644 --- a/modules/cache/cache_hash.h +++ b/modules/cache/cache_hash.h @@ -56,7 +56,7 @@ typedef struct cache_hash_index_t cache_hash_index_t; /** * Create a hash table. - * @param size + * @param size * @return The hash table just created */ cache_hash_t* cache_hash_make(apr_size_t size); @@ -66,7 +66,7 @@ cache_hash_t* cache_hash_make(apr_size_t size); * @param *ht Pointer to the hash table to be freed. * @return void * @remark The caller should ensure that all objects have been removed - * from the cache prior to calling cache_hash_free(). Objects + * from the cache prior to calling cache_hash_free(). Objects * not removed from the cache prior to calling cache_hash_free() * will be unaccessable. */ @@ -124,7 +124,7 @@ cache_hash_index_t* cache_hash_first(cache_hash_t *ht); /** * Continue iterating over the entries in a hash table. * @param hi The iteration state - * @return a pointer to the updated iteration state. NULL if there are no more + * @return a pointer to the updated iteration state. NULL if there are no more * entries. */ cache_hash_index_t* cache_hash_next(cache_hash_index_t *hi); @@ -138,7 +138,7 @@ cache_hash_index_t* cache_hash_next(cache_hash_index_t *hi); * @remark The return pointers should point to a variable that will be set to the * corresponding data, or they may be NULL if the data isn't interesting. */ -void cache_hash_this(cache_hash_index_t *hi, const void **key, +void cache_hash_this(cache_hash_index_t *hi, const void **key, apr_ssize_t *klen, void **val); /** diff --git a/modules/cache/cache_pqueue.h b/modules/cache/cache_pqueue.h index b658bb7fde..9b73690517 100644 --- a/modules/cache/cache_pqueue.h +++ b/modules/cache/cache_pqueue.h @@ -136,8 +136,8 @@ void *cache_pq_peek(cache_pqueue_t *q); * @param out the output handle * @param print the callback function to print the entry */ -void cache_pq_print(cache_pqueue_t *q, - FILE *out, +void cache_pq_print(cache_pqueue_t *q, + FILE *out, cache_pqueue_print_entry print); /** @@ -148,7 +148,7 @@ void cache_pq_print(cache_pqueue_t *q, * @param out the output handle * @param print the callback function to print the entry */ -void cache_pq_dump(cache_pqueue_t *q, +void cache_pq_dump(cache_pqueue_t *q, FILE *out, cache_pqueue_print_entry print); diff --git a/modules/core/mod_so.h b/modules/core/mod_so.h index d4ee05b149..2b26999ea7 100644 --- a/modules/core/mod_so.h +++ b/modules/core/mod_so.h @@ -17,7 +17,7 @@ /** * @file mod_so.h * @brief Shared Object Loader Extension Module for Apache - * + * * @defgroup MOD_SO mod_so * @ingroup APACHE_MODS * @{ diff --git a/modules/core/mod_watchdog.h b/modules/core/mod_watchdog.h index 43253dea1b..13d23ba960 100644 --- a/modules/core/mod_watchdog.h +++ b/modules/core/mod_watchdog.h @@ -78,7 +78,7 @@ extern "C" { typedef struct ap_watchdog_t ap_watchdog_t; -/* Create a set of AP_WD_DECLARE(type), AP_WD_DECLARE_NONSTD(type) and +/* Create a set of AP_WD_DECLARE(type), AP_WD_DECLARE_NONSTD(type) and * AP_WD_DECLARE_DATA with appropriate export and import tags for the platform */ #if !defined(AP_WD_DECLARE) @@ -154,7 +154,7 @@ APR_DECLARE_OPTIONAL_FN(apr_status_t, ap_watchdog_set_callback_interval, /** * Watchdog require hook. - * @param s The server record + * @param s The server record * @param name Watchdog name. * @param parent Non-zero to indicate the parent process watchdog mode. * @param singleton Non-zero to indicate the singleton watchdog mode. @@ -172,7 +172,7 @@ APR_DECLARE_EXTERNAL_HOOK(ap, AP_WD, int, watchdog_need, (server_rec *s, /** * Watchdog initialize hook. * It is called after the watchdog thread is initialized. - * @param s The server record + * @param s The server record * @param name Watchdog name. * @param pool The pool used to create the watchdog. */ @@ -184,7 +184,7 @@ APR_DECLARE_EXTERNAL_HOOK(ap, AP_WD, int, watchdog_init, ( /** * Watchdog terminate hook. * It is called when the watchdog thread is terminated. - * @param s The server record + * @param s The server record * @param name Watchdog name. * @param pool The pool used to create the watchdog. */ @@ -196,7 +196,7 @@ APR_DECLARE_EXTERNAL_HOOK(ap, AP_WD, int, watchdog_exit, ( /** * Fixed interval watchdog hook. * It is called regularly on @p AP_WD_TM_INTERVAL interval. - * @param s The server record + * @param s The server record * @param name Watchdog name. * @param pool Temporary pool destroyed after the call. */ diff --git a/modules/database/mod_dbd.h b/modules/database/mod_dbd.h index c1ee768b73..e4d21536fb 100644 --- a/modules/database/mod_dbd.h +++ b/modules/database/mod_dbd.h @@ -22,7 +22,7 @@ * http://www.apache.org/~niq/dbd.html * or * http://apache.webthing.com/database/ - * + * * @defgroup MOD_DBD mod_dbd * @ingroup APACHE_MODS * @{ @@ -31,7 +31,7 @@ #ifndef DBD_H #define DBD_H -/* Create a set of DBD_DECLARE(type), DBD_DECLARE_NONSTD(type) and +/* Create a set of DBD_DECLARE(type), DBD_DECLARE_NONSTD(type) and * DBD_DECLARE_DATA with appropriate export and import tags for the platform */ #if !defined(WIN32) diff --git a/modules/filters/libsed.h b/modules/filters/libsed.h index 6a8504afb9..ece11919a5 100644 --- a/modules/filters/libsed.h +++ b/modules/filters/libsed.h @@ -3,19 +3,19 @@ * Use is subject to license terms. * * Copyright (c) 1984 AT&T - * All Rights Reserved + * All Rights Reserved * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. */ #ifndef LIBSED_H diff --git a/modules/filters/mod_include.h b/modules/filters/mod_include.h index 1ae13c17c6..73714a298b 100644 --- a/modules/filters/mod_include.h +++ b/modules/filters/mod_include.h @@ -17,7 +17,7 @@ /** * @file mod_include.h * @brief Server Side Include Filter Extension Module for Apache - * + * * @defgroup MOD_INCLUDE mod_include * @ingroup APACHE_MODS * @{ @@ -113,7 +113,7 @@ APR_DECLARE_OPTIONAL_FN(char*, ap_ssi_parse_string, (include_ctx_t *ctx, const char *in, char *out, apr_size_t length, int leave_name)); -APR_DECLARE_OPTIONAL_FN(void, ap_register_include_handler, +APR_DECLARE_OPTIONAL_FN(void, ap_register_include_handler, (char *tag, include_handler_fn_t *func)); #endif /* MOD_INCLUDE */ diff --git a/modules/filters/mod_ratelimit.h b/modules/filters/mod_ratelimit.h index 4648326b80..6c69bb1aff 100644 --- a/modules/filters/mod_ratelimit.h +++ b/modules/filters/mod_ratelimit.h @@ -17,7 +17,7 @@ #ifndef _MOD_RATELIMIT_H_ #define _MOD_RATELIMIT_H_ -/* Create a set of AP_RL_DECLARE(type), AP_RL_DECLARE_NONSTD(type) and +/* Create a set of AP_RL_DECLARE(type), AP_RL_DECLARE_NONSTD(type) and * AP_RL_DECLARE_DATA with appropriate export and import tags for the platform */ #if !defined(WIN32) diff --git a/modules/filters/regexp.h b/modules/filters/regexp.h index 47b2119de0..49261656e9 100644 --- a/modules/filters/regexp.h +++ b/modules/filters/regexp.h @@ -2,8 +2,8 @@ * Copyright (c) 2005, 2008 Sun Microsystems, Inc. All Rights Reserved. * Use is subject to license terms. * - * Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T - * All Rights Reserved + * Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T + * All Rights Reserved * * University Copyright- Copyright (c) 1982, 1986, 1988 * The Regents of the University of California @@ -16,14 +16,14 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. */ #ifndef _REGEXP_H diff --git a/modules/filters/sed.h b/modules/filters/sed.h index 73f1420186..9178ddc9a6 100644 --- a/modules/filters/sed.h +++ b/modules/filters/sed.h @@ -3,19 +3,19 @@ * Use is subject to license terms. * * Copyright (c) 1984 AT&T - * All Rights Reserved + * All Rights Reserved * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. */ #ifndef _SED_H diff --git a/modules/generators/mod_cgi.h b/modules/generators/mod_cgi.h index c5d989177b..424c6f295f 100644 --- a/modules/generators/mod_cgi.h +++ b/modules/generators/mod_cgi.h @@ -17,7 +17,7 @@ /** * @file mod_cgi.h * @brief CGI Script Execution Extension Module for Apache - * + * * @defgroup MOD_CGI mod_cgi * @ingroup APACHE_MODS * @{ @@ -53,13 +53,13 @@ typedef struct { * @param p The pool to allocate correct cmd/argv elements within. * @param e_info pass e_info.cmd_type (Set to APR_SHELLCMD or APR_PROGRAM on entry) and e_info.detached (Should the child start in detached state?) - * @remark This callback may be registered by the os-specific module + * @remark This callback may be registered by the os-specific module * to correct the command and arguments for apr_proc_create invocation * on a given os. mod_cgi will call the function if registered. */ -APR_DECLARE_OPTIONAL_FN(apr_status_t, ap_cgi_build_command, +APR_DECLARE_OPTIONAL_FN(apr_status_t, ap_cgi_build_command, (const char **cmd, const char ***argv, - request_rec *r, apr_pool_t *p, + request_rec *r, apr_pool_t *p, cgi_exec_info_t *e_info)); #endif /* _MOD_CGI_H */ diff --git a/modules/generators/mod_suexec.h b/modules/generators/mod_suexec.h index ab59d98356..80e2504107 100644 --- a/modules/generators/mod_suexec.h +++ b/modules/generators/mod_suexec.h @@ -17,7 +17,7 @@ /** * @file mod_suexec.h * @brief SuExec Extension Module for Apache - * + * * @defgroup MOD_SUEXEC mod_suexec * @ingroup APACHE_MODS * @{ diff --git a/modules/ldap/util_ldap_cache.h b/modules/ldap/util_ldap_cache.h index 4c63e6059a..234a6ea0d8 100644 --- a/modules/ldap/util_ldap_cache.h +++ b/modules/ldap/util_ldap_cache.h @@ -57,7 +57,7 @@ struct util_ald_cache { double avg_purgetime; /* Average time to purge the cache */ apr_time_t last_purge; /* Time of the last purge */ unsigned long npurged; /* Number of elements purged in last purge. This is not - obvious: it won't be 3/4 the size of the cache if + obvious: it won't be 3/4 the size of the cache if there were a lot of expired entries. */ unsigned long fetches; /* Number of fetches */ @@ -105,14 +105,14 @@ typedef struct util_compare_subgroup_t { } util_compare_subgroup_t; /* - * We cache every successful search and bind operation, using the username - * as the key. Each node in the cache contains the returned DN, plus the + * We cache every successful search and bind operation, using the username + * as the key. Each node in the cache contains the returned DN, plus the * password used to bind. */ typedef struct util_search_node_t { const char *username; /* Cache key */ const char *dn; /* DN returned from search */ - const char *bindpw; /* The most recently used bind password; + const char *bindpw; /* The most recently used bind password; NULL if the bind failed */ apr_time_t lastbind; /* Time of last successful bind */ const char **vals; /* Values of queried attributes */ @@ -121,11 +121,11 @@ typedef struct util_search_node_t { /* * We cache every successful compare operation, using the DN, attrib, and - * value as the key. + * value as the key. */ typedef struct util_compare_node_t { const char *dn; /* DN, attrib and value combine to be the key */ - const char *attrib; + const char *attrib; const char *value; apr_time_t lastcompare; int result; @@ -188,12 +188,12 @@ void util_ald_cache_purge(util_ald_cache_t *cache); util_url_node_t *util_ald_create_caches(util_ldap_state_t *s, const char *url); util_ald_cache_t *util_ald_create_cache(util_ldap_state_t *st, long cache_size, - unsigned long (*hashfunc)(void *), + unsigned long (*hashfunc)(void *), int (*comparefunc)(void *, void *), void * (*copyfunc)(util_ald_cache_t *cache, void *), void (*freefunc)(util_ald_cache_t *cache, void *), void (*displayfunc)(request_rec *r, util_ald_cache_t *cache, void *)); - + void util_ald_destroy_cache(util_ald_cache_t *cache); void *util_ald_cache_fetch(util_ald_cache_t *cache, void *payload); void *util_ald_cache_insert(util_ald_cache_t *cache, void *payload); diff --git a/modules/loggers/mod_log_config.h b/modules/loggers/mod_log_config.h index 2a9815505f..877a593262 100644 --- a/modules/loggers/mod_log_config.h +++ b/modules/loggers/mod_log_config.h @@ -17,7 +17,7 @@ /** * @file mod_log_config.h * @brief Logging Configuration Extension Module for Apache - * + * * @defgroup MOD_LOG_CONFIG mod_log_config * @ingroup APACHE_MODS * @{ @@ -30,7 +30,7 @@ #ifndef _MOD_LOG_CONFIG_H #define _MOD_LOG_CONFIG_H 1 -/** +/** * callback function prototype for a external log handler */ typedef const char *ap_log_handler_fn_t(request_rec *r, char *a); @@ -38,14 +38,14 @@ typedef const char *ap_log_handler_fn_t(request_rec *r, char *a); /** * callback function prototype for external writer initialization. */ -typedef void *ap_log_writer_init(apr_pool_t *p, server_rec *s, +typedef void *ap_log_writer_init(apr_pool_t *p, server_rec *s, const char *name); /** * callback which gets called where there is a log line to write. */ typedef apr_status_t ap_log_writer( request_rec *r, - void *handle, + void *handle, const char **portions, int *lengths, int nelts, @@ -56,15 +56,15 @@ typedef struct ap_log_handler { int want_orig_default; } ap_log_handler; -APR_DECLARE_OPTIONAL_FN(void, ap_register_log_handler, +APR_DECLARE_OPTIONAL_FN(void, ap_register_log_handler, (apr_pool_t *p, char *tag, ap_log_handler_fn_t *func, int def)); /** - * you will need to set your init handler *BEFORE* the open_logs + * you will need to set your init handler *BEFORE* the open_logs * in mod_log_config gets executed */ APR_DECLARE_OPTIONAL_FN(ap_log_writer_init*, ap_log_set_writer_init,(ap_log_writer_init *func)); -/** +/** * you should probably set the writer at the same time (ie..before open_logs) */ APR_DECLARE_OPTIONAL_FN(ap_log_writer*, ap_log_set_writer, (ap_log_writer* func)); diff --git a/modules/lua/lua_vmprep.h b/modules/lua/lua_vmprep.h index ef0d629c1c..3e1b68f3e5 100644 --- a/modules/lua/lua_vmprep.h +++ b/modules/lua/lua_vmprep.h @@ -86,9 +86,9 @@ typedef struct /* pool to use for lifecycle if APL_SCOPE_ONCE is set, otherwise unused */ apr_pool_t *pool; - /* Pre-compiled Lua Byte code to load directly. If bytecode_len is >0, + /* Pre-compiled Lua Byte code to load directly. If bytecode_len is >0, * the file part of this structure is ignored for loading purposes, but - * it is used for error messages. + * it is used for error messages. */ const char *bytecode; apr_size_t bytecode_len; @@ -129,7 +129,7 @@ AP_LUA_DECLARE(void) ap_lua_load_apache2_lmodule(lua_State *L); * If one exists, will return extant one, otherwise will create, attach, and return * This does no locking around the lua_State, so if the pool is shared between * threads, locking is up the client. - * + * * @lifecycle_pool -> pool whose lifeycle controls the lua_State * @file file to be opened, also used as a key for uniquing lua_States * @cb callback for vm initialization called *before* the file is opened diff --git a/modules/lua/mod_lua.h b/modules/lua/mod_lua.h index 5b790a068d..32a766f9e0 100644 --- a/modules/lua/mod_lua.h +++ b/modules/lua/mod_lua.h @@ -44,7 +44,7 @@ #include "lauxlib.h" #include "lualib.h" -/* Create a set of AP_LUA_DECLARE(type), AP_LUA_DECLARE_NONSTD(type) and +/* Create a set of AP_LUA_DECLARE(type), AP_LUA_DECLARE_NONSTD(type) and * AP_LUA_DECLARE_DATA with appropriate export and import tags for the platform */ #if !defined(WIN32) @@ -98,7 +98,7 @@ typedef struct */ unsigned int code_cache_style; - /** + /** * APL_SCOPE_ONCE | APL_SCOPE_REQUEST | APL_SCOPE_CONN | APL_SCOPE_SERVER */ unsigned int vm_scope; diff --git a/modules/mappers/mod_rewrite.h b/modules/mappers/mod_rewrite.h index 4cbcea1e34..040baeeac1 100644 --- a/modules/mappers/mod_rewrite.h +++ b/modules/mappers/mod_rewrite.h @@ -17,7 +17,7 @@ /** * @file mod_rewrite.h * @brief Rewrite Extension module for Apache - * + * * @defgroup MOD_REWRITE mod_rewrite * @ingroup APACHE_MODS * @{ diff --git a/modules/proxy/ajp.h b/modules/proxy/ajp.h index 57931e68f1..b1596ca73b 100644 --- a/modules/proxy/ajp.h +++ b/modules/proxy/ajp.h @@ -83,42 +83,42 @@ /** AJP Specific error codes */ /** Buffer overflow exception */ -#define AJP_EOVERFLOW (APR_OS_START_USERERR + 1) +#define AJP_EOVERFLOW (APR_OS_START_USERERR + 1) /** Destination Buffer is to small */ -#define AJP_ETOSMALL (APR_OS_START_USERERR + 2) +#define AJP_ETOSMALL (APR_OS_START_USERERR + 2) /** Invalid input parameters */ -#define AJP_EINVAL (APR_OS_START_USERERR + 3) +#define AJP_EINVAL (APR_OS_START_USERERR + 3) /** Bad message signature */ -#define AJP_EBAD_SIGNATURE (APR_OS_START_USERERR + 4) +#define AJP_EBAD_SIGNATURE (APR_OS_START_USERERR + 4) /** Incoming message too bg */ -#define AJP_ETOBIG (APR_OS_START_USERERR + 5) +#define AJP_ETOBIG (APR_OS_START_USERERR + 5) /** Missing message header */ -#define AJP_ENO_HEADER (APR_OS_START_USERERR + 6) +#define AJP_ENO_HEADER (APR_OS_START_USERERR + 6) /** Bad message header */ -#define AJP_EBAD_HEADER (APR_OS_START_USERERR + 7) +#define AJP_EBAD_HEADER (APR_OS_START_USERERR + 7) /** Bad message */ -#define AJP_EBAD_MESSAGE (APR_OS_START_USERERR + 8) +#define AJP_EBAD_MESSAGE (APR_OS_START_USERERR + 8) /** Cant log via AJP14 */ -#define AJP_ELOGFAIL (APR_OS_START_USERERR + 9) +#define AJP_ELOGFAIL (APR_OS_START_USERERR + 9) /** Bad request method */ -#define AJP_EBAD_METHOD (APR_OS_START_USERERR + 10) +#define AJP_EBAD_METHOD (APR_OS_START_USERERR + 10) -/** A structure that represents ajp message */ +/** A structure that represents ajp message */ typedef struct ajp_msg ajp_msg_t; -/** A structure that represents ajp message */ +/** A structure that represents ajp message */ struct ajp_msg { - /** The buffer holding a AJP message */ + /** The buffer holding a AJP message */ apr_byte_t *buf; - /** The length of AJP message header (defaults to AJP_HEADER_LEN) */ + /** The length of AJP message header (defaults to AJP_HEADER_LEN) */ apr_size_t header_len; - /** The length of AJP message */ + /** The length of AJP message */ apr_size_t len; - /** The current read position */ + /** The current read position */ apr_size_t pos; - /** Flag indicating the origing of the message */ + /** Flag indicating the origing of the message */ int server_side; /** The size of the buffer */ apr_size_t max_size; @@ -223,8 +223,8 @@ apr_status_t ajp_msg_append_uint16(ajp_msg_t *msg, apr_uint16_t value); apr_status_t ajp_msg_append_uint8(ajp_msg_t *msg, apr_byte_t value); /** - * Add a String in AJP message, and transform the String in ASCII - * if convert is set and we're on an EBCDIC machine + * Add a String in AJP message, and transform the String in ASCII + * if convert is set and we're on an EBCDIC machine * * @param msg AJP Message to get value from * @param value Pointer to String @@ -234,13 +234,13 @@ apr_status_t ajp_msg_append_uint8(ajp_msg_t *msg, apr_byte_t value); apr_status_t ajp_msg_append_string_ex(ajp_msg_t *msg, const char *value, int convert); /** - * Add a String in AJP message, and transform - * the String in ASCII if we're on an EBCDIC machine + * Add a String in AJP message, and transform + * the String in ASCII if we're on an EBCDIC machine */ #define ajp_msg_append_string(m, v) ajp_msg_append_string_ex(m, v, 1) /** - * Add a String in AJP message. + * Add a String in AJP message. */ #define ajp_msg_append_string_ascii(m, v) ajp_msg_append_string_ex(m, v, 0) @@ -354,7 +354,7 @@ apr_status_t ajp_msg_copy(ajp_msg_t *smsg, ajp_msg_t *dmsg); */ apr_status_t ajp_msg_serialize_ping(ajp_msg_t *msg); -/** +/** * Serialize in an AJP Message a CPING command * * +-----------------------+ @@ -389,7 +389,7 @@ apr_status_t ajp_msg_dump(apr_pool_t *pool, ajp_msg_t *msg, char *err, */ apr_status_t ajp_msg_log(request_rec *r, ajp_msg_t *msg, char *err); -/** +/** * Send an AJP message to backend * * @param sock backend socket @@ -398,7 +398,7 @@ apr_status_t ajp_msg_log(request_rec *r, ajp_msg_t *msg, char *err); */ apr_status_t ajp_ilink_send(apr_socket_t *sock, ajp_msg_t *msg); -/** +/** * Receive an AJP message from backend * * @param sock backend socket @@ -447,14 +447,14 @@ apr_status_t ajp_alloc_data_msg(apr_pool_t *pool, char **ptr, * Send the data message * @param sock backend socket * @param msg AJP message to send - * @param len AJP message length + * @param len AJP message length * @return APR_SUCCESS or error */ apr_status_t ajp_send_data_msg(apr_socket_t *sock, ajp_msg_t *msg, apr_size_t len); /** - * Parse the message type + * Parse the message type * @param r current request * @param msg AJP message * @return AJP message type. @@ -462,7 +462,7 @@ apr_status_t ajp_send_data_msg(apr_socket_t *sock, int ajp_parse_type(request_rec *r, ajp_msg_t *msg); /** - * Parse the header message from container + * Parse the header message from container * @param r current request * @param conf proxy config * @param msg AJP message @@ -471,11 +471,11 @@ int ajp_parse_type(request_rec *r, ajp_msg_t *msg); apr_status_t ajp_parse_header(request_rec *r, proxy_dir_conf *conf, ajp_msg_t *msg); -/** - * Parse the message body and return data address and length +/** + * Parse the message body and return data address and length * @param r current request * @param msg AJP message - * @param len returned AJP message length + * @param len returned AJP message length * @param ptr returned data * @return APR_SUCCESS or error */ @@ -494,7 +494,7 @@ apr_status_t ajp_parse_reuse(request_rec *r, ajp_msg_t *msg, apr_byte_t *reuse); -/** +/** * Handle the CPING/CPONG messages * @param sock backend socket * @param r current request diff --git a/modules/proxy/ajp_header.h b/modules/proxy/ajp_header.h index 35379feef9..18f67f121d 100644 --- a/modules/proxy/ajp_header.h +++ b/modules/proxy/ajp_header.h @@ -27,7 +27,7 @@ /* * Conditional request attributes - * + * */ #define SC_A_CONTEXT (unsigned char)1 #define SC_A_SERVLET_PATH (unsigned char)2 @@ -56,12 +56,12 @@ * The list of methods was taken from Section 5.1.1 of RFC 2616, * RFC 2518, the ACL IETF draft, and the DeltaV IESG Proposed Standard. * Method = "OPTIONS" - * | "GET" - * | "HEAD" - * | "POST" - * | "PUT" - * | "DELETE" - * | "TRACE" + * | "GET" + * | "HEAD" + * | "POST" + * | "PUT" + * | "DELETE" + * | "TRACE" * | "PROPFIND" * | "PROPPATCH" * | "MKCOL" @@ -82,7 +82,7 @@ * | "MERGE" * | "BASELINE-CONTROL" * | "MKACTIVITY" - * + * */ #define SC_M_OPTIONS (unsigned char)1 #define SC_M_GET (unsigned char)2 @@ -116,7 +116,7 @@ /* * Frequent request headers, these headers are coded as numbers * instead of strings. - * + * * Accept * Accept-Charset * Accept-Encoding @@ -131,7 +131,7 @@ * Pragma * Referer * User-Agent - * + * */ #define SC_ACCEPT (unsigned short)0xA001 @@ -142,7 +142,7 @@ #define SC_CONNECTION (unsigned short)0xA006 #define SC_CONTENT_TYPE (unsigned short)0xA007 #define SC_CONTENT_LENGTH (unsigned short)0xA008 -#define SC_COOKIE (unsigned short)0xA009 +#define SC_COOKIE (unsigned short)0xA009 #define SC_COOKIE2 (unsigned short)0xA00A #define SC_HOST (unsigned short)0xA00B #define SC_PRAGMA (unsigned short)0xA00C @@ -152,7 +152,7 @@ /* * Frequent response headers, these headers are coded as numbers * instead of strings. - * + * * Content-Type * Content-Language * Content-Length @@ -163,7 +163,7 @@ * Servlet-Engine * Status * WWW-Authenticate - * + * */ #define SC_RESP_CONTENT_TYPE (unsigned short)0xA001 diff --git a/modules/proxy/mod_serf.h b/modules/proxy/mod_serf.h index 90353ad305..39fb541b30 100644 --- a/modules/proxy/mod_serf.h +++ b/modules/proxy/mod_serf.h @@ -59,7 +59,7 @@ struct ap_serf_cluster_provider_t { */ void *baton; /** - * Check that the key/value pairs used to configure the + * Check that the key/value pairs used to configure the * cluster are valid. * * Return non-NULL on failure with an error message, like standard httpd @@ -73,8 +73,8 @@ struct ap_serf_cluster_provider_t { /** * Provide an ordered array of ap_serf_server_t in the order that * mod_serf should attempt to use them. If a server on the list - * is known to be not responding, it may be skipped. If mod_serf is - * unable to contact any of the servers, a 502 will be returned to the + * is known to be not responding, it may be skipped. If mod_serf is + * unable to contact any of the servers, a 502 will be returned to the * client. * * Returns OK on sucess, all other return codes will result in a 500. diff --git a/modules/session/mod_session.h b/modules/session/mod_session.h index 0809cff53f..647f8c59a2 100644 --- a/modules/session/mod_session.h +++ b/modules/session/mod_session.h @@ -17,7 +17,7 @@ #ifndef MOD_SESSION_H #define MOD_SESSION_H -/* Create a set of SESSION_DECLARE(type), SESSION_DECLARE_NONSTD(type) and +/* Create a set of SESSION_DECLARE(type), SESSION_DECLARE_NONSTD(type) and * SESSION_DECLARE_DATA with appropriate export and import tags for the platform */ #if !defined(WIN32) diff --git a/modules/ssl/mod_ssl.h b/modules/ssl/mod_ssl.h index c7b2c613bb..48984e2401 100644 --- a/modules/ssl/mod_ssl.h +++ b/modules/ssl/mod_ssl.h @@ -37,9 +37,9 @@ APR_DECLARE_OPTIONAL_FN(char *, ssl_var_lookup, char *)); /** The ssl_ext_list() optional function attempts to build an array - * of all the values contained in the named X.509 extension. The + * of all the values contained in the named X.509 extension. The * returned array will be created in the supplied pool. - * The client certificate is used if peer is non-zero; the server + * The client certificate is used if peer is non-zero; the server * certificate is used otherwise. * Extension specifies the extensions to use as a string. This can be * one of the "known" long or short names, or a numeric OID, diff --git a/modules/ssl/ssl_private.h b/modules/ssl/ssl_private.h index ef85e6be75..584b836b24 100644 --- a/modules/ssl/ssl_private.h +++ b/modules/ssl/ssl_private.h @@ -18,7 +18,7 @@ #define SSL_PRIVATE_H /** - * @file ssl_private.h + * @file ssl_private.h * @brief Internal interfaces private to mod_ssl. * * @defgroup MOD_SSL_PRIVATE Private @@ -147,7 +147,7 @@ #ifndef PEM_F_DEF_CALLBACK #ifdef PEM_F_PEM_DEF_CALLBACK /** In OpenSSL 0.9.8 PEM_F_DEF_CALLBACK was renamed */ -#define PEM_F_DEF_CALLBACK PEM_F_PEM_DEF_CALLBACK +#define PEM_F_DEF_CALLBACK PEM_F_PEM_DEF_CALLBACK #endif #endif @@ -428,7 +428,7 @@ typedef struct { /* Track the handshake/renegotiation state for the connection so * that all client-initiated renegotiations can be rejected, as a * partial fix for CVE-2009-3555. */ - enum { + enum { RENEG_INIT = 0, /* Before initial handshake */ RENEG_REJECT, /* After initial handshake; any client-initiated * renegotiation should be rejected */ @@ -437,7 +437,7 @@ typedef struct { RENEG_ABORT /* Renegotiation initiated by client, abort the * connection */ } reneg_state; - + server_rec *server; } SSLConnRec; @@ -720,7 +720,7 @@ int ssl_init_Module(apr_pool_t *, apr_pool_t *, apr_pool_t *, server_re void ssl_init_Engine(server_rec *, apr_pool_t *); void ssl_init_ConfigureServer(server_rec *, apr_pool_t *, apr_pool_t *, SSLSrvConfigRec *); void ssl_init_CheckServers(server_rec *, apr_pool_t *); -STACK_OF(X509_NAME) +STACK_OF(X509_NAME) *ssl_init_FindCAList(server_rec *, apr_pool_t *, const char *, const char *); void ssl_init_Child(apr_pool_t *, server_rec *); apr_status_t ssl_init_ModuleKill(void *data); @@ -806,7 +806,7 @@ void ssl_util_ppclose(server_rec *, apr_pool_t *, apr_file_t *); char *ssl_util_readfilter(server_rec *, apr_pool_t *, const char *, const char * const *); BOOL ssl_util_path_check(ssl_pathcheck_t, const char *, apr_pool_t *); -ssl_algo_t ssl_util_algotypeof(X509 *, EVP_PKEY *); +ssl_algo_t ssl_util_algotypeof(X509 *, EVP_PKEY *); char *ssl_util_algotypestr(ssl_algo_t); void ssl_util_thread_setup(apr_pool_t *); int ssl_init_ssl_connection(conn_rec *c, request_rec *r); @@ -857,17 +857,17 @@ void ssl_log_ssl_error(const char *, int, int, server_rec *); * additional argument (whose details are appended to the log message). * The other arguments are interpreted exactly as with their ap_log_*error * counterparts. */ -void ssl_log_xerror(const char *file, int line, int level, +void ssl_log_xerror(const char *file, int line, int level, apr_status_t rv, apr_pool_t *p, server_rec *s, X509 *cert, const char *format, ...) __attribute__((format(printf,8,9))); -void ssl_log_cxerror(const char *file, int line, int level, +void ssl_log_cxerror(const char *file, int line, int level, apr_status_t rv, conn_rec *c, X509 *cert, const char *format, ...) __attribute__((format(printf,7,8))); -void ssl_log_rxerror(const char *file, int line, int level, +void ssl_log_rxerror(const char *file, int line, int level, apr_status_t rv, request_rec *r, X509 *cert, const char *format, ...) __attribute__((format(printf,7,8))); @@ -891,7 +891,7 @@ void modssl_var_extract_dns(apr_table_t *t, SSL *ssl, apr_pool_t *p); /* Perform OCSP validation of the current cert in the given context. * Returns non-zero on success or zero on failure. On failure, the * context error code is set. */ -int modssl_verify_ocsp(X509_STORE_CTX *ctx, SSLSrvConfigRec *sc, +int modssl_verify_ocsp(X509_STORE_CTX *ctx, SSLSrvConfigRec *sc, server_rec *s, conn_rec *c, apr_pool_t *pool); /* OCSP helper interface; dispatches the given OCSP request to the diff --git a/modules/ssl/ssl_util_ssl.h b/modules/ssl/ssl_util_ssl.h index f8611be2ce..59a98e68b8 100644 --- a/modules/ssl/ssl_util_ssl.h +++ b/modules/ssl/ssl_util_ssl.h @@ -54,7 +54,7 @@ #define SSL_SESSION_ID_STRING_LEN \ ((SSL_MAX_SSL_SESSION_ID_LENGTH + 1) * 2) -/** +/** * Additional Functions */ void SSL_init_app_data2_idx(void); |