You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2011/09/23 15:38:12 UTC
svn commit: r1174748 [2/2] - in /httpd/httpd/trunk: include/ modules/aaa/
modules/arch/unix/ modules/arch/win32/ modules/cache/ modules/core/
modules/database/ modules/filters/ modules/generators/ modules/ldap/
modules/loggers/ modules/lua/ modules/map...
Modified: httpd/httpd/trunk/include/util_filter.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/util_filter.h?rev=1174748&r1=1174747&r2=1174748&view=diff
==============================================================================
--- httpd/httpd/trunk/include/util_filter.h (original)
+++ httpd/httpd/trunk/include/util_filter.h Fri Sep 23 13:38:09 2011
@@ -42,7 +42,7 @@ typedef enum {
/** The filter should return at most readbytes data. */
AP_MODE_READBYTES,
/** The filter should return at most one line of CRLF data.
- * (If a potential line is too long or no CRLF is found, the
+ * (If a potential line is too long or no CRLF is found, the
* filter may return partial data).
*/
AP_MODE_GETLINE,
@@ -106,7 +106,7 @@ typedef struct ap_filter_t ap_filter_t;
*
* Callbacks are associated with a filter definition, which is specified
* by name. See ap_register_input_filter() and ap_register_output_filter()
- * for setting the association between a name for a filter and its
+ * for setting the association between a name for a filter and its
* associated callback (and other information).
*
* If the initialization function argument passed to the registration
@@ -127,14 +127,14 @@ typedef struct ap_filter_t ap_filter_t;
* For the input and output filters, the return value of a filter should be
* an APR status value. For the init function, the return value should
* be an HTTP error code or OK if it was successful.
- *
+ *
* @ingroup filter
* @{
*/
typedef apr_status_t (*ap_out_filter_func)(ap_filter_t *f,
apr_bucket_brigade *b);
typedef apr_status_t (*ap_in_filter_func)(ap_filter_t *f,
- apr_bucket_brigade *b,
+ apr_bucket_brigade *b,
ap_input_mode_t mode,
apr_read_type_e block,
apr_off_t readbytes);
@@ -235,9 +235,9 @@ struct ap_filter_rec_t {
/** Providers for this filter */
ap_filter_provider_t *providers;
- /** The type of filter, either AP_FTYPE_CONTENT or AP_FTYPE_CONNECTION.
- * An AP_FTYPE_CONTENT filter modifies the data based on information
- * found in the content. An AP_FTYPE_CONNECTION filter modifies the
+ /** The type of filter, either AP_FTYPE_CONTENT or AP_FTYPE_CONNECTION.
+ * An AP_FTYPE_CONTENT filter modifies the data based on information
+ * found in the content. An AP_FTYPE_CONNECTION filter modifies the
* data based on the type of connection.
*/
ap_filter_type ftype;
@@ -250,7 +250,7 @@ struct ap_filter_rec_t {
};
/**
- * @brief The representation of a filter chain.
+ * @brief The representation of a filter chain.
*
* Each request has a list
* of these structures which are called in turn to filter the data. Sub
@@ -282,7 +282,7 @@ struct ap_filter_t {
/**
* Get the current bucket brigade from the next filter on the filter
- * stack. The filter returns an apr_status_t value. If the bottom-most
+ * stack. The filter returns an apr_status_t value. If the bottom-most
* filter doesn't read from the network, then ::AP_NOBODY_READ is returned.
* The bucket brigade will be empty when there is nothing left to get.
* @param filter The next filter in the chain
@@ -293,15 +293,15 @@ struct ap_filter_t {
* ::APR_BLOCK_READ, ::APR_NONBLOCK_READ
* @param readbytes How many bytes to read from the next filter.
*/
-AP_DECLARE(apr_status_t) ap_get_brigade(ap_filter_t *filter,
- apr_bucket_brigade *bucket,
+AP_DECLARE(apr_status_t) ap_get_brigade(ap_filter_t *filter,
+ apr_bucket_brigade *bucket,
ap_input_mode_t mode,
- apr_read_type_e block,
+ apr_read_type_e block,
apr_off_t readbytes);
/**
* Pass the current bucket brigade down to the next filter on the filter
- * stack. The filter returns an apr_status_t value. If the bottom-most
+ * stack. The filter returns an apr_status_t value. If the bottom-most
* filter doesn't write to the network, then ::AP_NOBODY_WROTE is returned.
* @param filter The next filter in the chain
* @param bucket The current bucket brigade
@@ -315,14 +315,14 @@ AP_DECLARE(apr_status_t) ap_pass_brigade
apr_bucket_brigade *bucket);
/**
- * This function is used to register an input filter with the system.
- * After this registration is performed, then a filter may be added
- * into the filter chain by using ap_add_input_filter() and simply
+ * This function is used to register an input filter with the system.
+ * After this registration is performed, then a filter may be added
+ * into the filter chain by using ap_add_input_filter() and simply
* specifying the name.
*
* @param name The name to attach to the filter function
* @param filter_func The filter function to name
- * @param filter_init The function to call before the filter handlers
+ * @param filter_init The function to call before the filter handlers
are invoked
* @param ftype The type of filter function, either ::AP_FTYPE_CONTENT_SET or
* ::AP_FTYPE_CONNECTION
@@ -345,14 +345,14 @@ AP_DECLARE(ap_filter_rec_t *) ap_registe
*/
/**
- * This function is used to register an output filter with the system.
- * After this registration is performed, then a filter may be added
+ * This function is used to register an output filter with the system.
+ * After this registration is performed, then a filter may be added
* directly to the filter chain by using ap_add_output_filter() and
* simply specifying the name, or as a provider under mod_filter.
*
* @param name The name to attach to the filter function
* @param filter_func The filter function to name
- * @param filter_init The function to call before the filter handlers
+ * @param filter_init The function to call before the filter handlers
* are invoked
* @param ftype The type of filter function, either ::AP_FTYPE_CONTENT_SET or
* ::AP_FTYPE_CONNECTION
@@ -376,7 +376,7 @@ AP_DECLARE(ap_filter_rec_t *) ap_registe
* calls to ap_add_filter). If the current filter chain contains filters
* from another request, then this filter will be added before those other
* filters.
- *
+ *
* To re-iterate that last comment. This function is building a FIFO
* list of filters. Take note of that when adding your filter to the chain.
*
@@ -421,7 +421,7 @@ AP_DECLARE(ap_filter_rec_t *) ap_get_inp
* object r must be passed in to ensure the filter chains are modified
* correctly. f->r will still be initialized as NULL in the new filter.
*/
-AP_DECLARE(ap_filter_t *) ap_add_output_filter(const char *name, void *ctx,
+AP_DECLARE(ap_filter_t *) ap_add_output_filter(const char *name, void *ctx,
request_rec *r, conn_rec *c);
/**
@@ -479,7 +479,7 @@ AP_DECLARE(void) ap_remove_output_filter
*/
/**
- * prepare a bucket brigade to be setaside. If a different brigade was
+ * prepare a bucket brigade to be setaside. If a different brigade was
* set-aside earlier, then the two brigades are concatenated together.
* @param f The current filter
* @param save_to The brigade that was previously set-aside. Regardless, the
@@ -490,7 +490,7 @@ AP_DECLARE(void) ap_remove_output_filter
*/
AP_DECLARE(apr_status_t) ap_save_brigade(ap_filter_t *f,
apr_bucket_brigade **save_to,
- apr_bucket_brigade **b, apr_pool_t *p);
+ apr_bucket_brigade **b, apr_pool_t *p);
/**
* Flush function for apr_brigade_* calls. This calls ap_pass_brigade
@@ -560,7 +560,7 @@ AP_DECLARE_NONSTD(apr_status_t) ap_fprin
apr_bucket_brigade *bb,
const char *fmt,
...)
- __attribute__((format(printf,3,4)));
+ __attribute__((format(printf,3,4)));
/**
* set protocol requirements for an output content filter
Modified: httpd/httpd/trunk/include/util_ldap.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/util_ldap.h?rev=1174748&r1=1174747&r2=1174748&view=diff
==============================================================================
--- httpd/httpd/trunk/include/util_ldap.h (original)
+++ httpd/httpd/trunk/include/util_ldap.h Fri Sep 23 13:38:09 2011
@@ -62,7 +62,7 @@
#include "http_request.h"
#include "apr_optional.h"
-/* Create a set of LDAP_DECLARE macros with appropriate export
+/* Create a set of LDAP_DECLARE macros with appropriate export
* and import tags for the platform
*/
#if !defined(WIN32)
@@ -93,9 +93,9 @@ extern "C" {
/* Values that the deref member can have */
typedef enum {
- never=LDAP_DEREF_NEVER,
- searching=LDAP_DEREF_SEARCHING,
- finding=LDAP_DEREF_FINDING,
+ never=LDAP_DEREF_NEVER,
+ searching=LDAP_DEREF_SEARCHING,
+ finding=LDAP_DEREF_FINDING,
always=LDAP_DEREF_ALWAYS
} deref_options;
@@ -137,7 +137,7 @@ typedef struct util_ldap_config_t {
apr_array_header_t *client_certs; /* Client certificates */
} util_ldap_config_t;
-/* LDAP cache state information */
+/* LDAP cache state information */
typedef struct util_ldap_state_t {
apr_pool_t *pool; /* pool from which this state is allocated */
#if APR_HAS_THREADS
@@ -193,7 +193,7 @@ struct mod_auth_ldap_groupattr_entry_t {
* @fn int util_ldap_connection_open(request_rec *r,
* util_ldap_connection_t *ldc)
*/
-APR_DECLARE_OPTIONAL_FN(int,uldap_connection_open,(request_rec *r,
+APR_DECLARE_OPTIONAL_FN(int,uldap_connection_open,(request_rec *r,
util_ldap_connection_t *ldc));
/**
@@ -226,7 +226,7 @@ APR_DECLARE_OPTIONAL_FN(apr_status_t,uld
* @param binddn The DN to bind with
* @param bindpw The password to bind with
* @param deref The dereferencing behavior
- * @param secure use SSL on the connection
+ * @param secure use SSL on the connection
* @tip Once a connection is found and returned, a lock will be acquired to
* lock that particular connection, so that another thread does not try and
* use this connection while it is busy. Once you are finished with a connection,
@@ -257,8 +257,8 @@ APR_DECLARE_OPTIONAL_FN(util_ldap_connec
* const char *url, const char *dn, const char *reqdn,
* int compare_dn_on_server)
*/
-APR_DECLARE_OPTIONAL_FN(int,uldap_cache_comparedn,(request_rec *r, util_ldap_connection_t *ldc,
- const char *url, const char *dn, const char *reqdn,
+APR_DECLARE_OPTIONAL_FN(int,uldap_cache_comparedn,(request_rec *r, util_ldap_connection_t *ldc,
+ const char *url, const char *dn, const char *reqdn,
int compare_dn_on_server));
/**
@@ -268,7 +268,7 @@ APR_DECLARE_OPTIONAL_FN(int,uldap_cache_
* @param url The URL of the LDAP connection - used for deciding which cache to use.
* @param dn The DN of the object in which we do the compare.
* @param attrib The attribute within the object we are comparing for.
- * @param value The value of the attribute we are trying to compare for.
+ * @param value The value of the attribute we are trying to compare for.
* @tip Use this function to determine whether an attribute/value pair exists within an
* object. Typically this would be used to determine LDAP top-level group
* membership.
Modified: httpd/httpd/trunk/include/util_mutex.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/util_mutex.h?rev=1174748&r1=1174747&r2=1174748&view=diff
==============================================================================
--- httpd/httpd/trunk/include/util_mutex.h (original)
+++ httpd/httpd/trunk/include/util_mutex.h Fri Sep 23 13:38:09 2011
@@ -167,7 +167,7 @@ AP_DECLARE(apr_status_t) ap_mutex_regist
* stored. If this mutex is disabled, mutex will be set to NULL on
* output. (That is allowed only if the AP_MUTEX_ALLOW_NONE flag is
* passed to ap_mutex_register().)
- * @param name The generated filename of the created mutex, or NULL if
+ * @param name The generated filename of the created mutex, or NULL if
* no file was created. Pass NULL if this result is not needed.
* @param type The type name of the mutex, matching the type name passed
* to ap_mutex_register().
@@ -194,7 +194,7 @@ AP_DECLARE(apr_status_t) ap_global_mutex
* stored. If this mutex is disabled, mutex will be set to NULL on
* output. (That is allowed only if the AP_MUTEX_ALLOW_NONE flag is
* passed to ap_mutex_register().)
- * @param name The generated filename of the created mutex, or NULL if
+ * @param name The generated filename of the created mutex, or NULL if
* no file was created. Pass NULL if this result is not needed.
* @param type The type name of the mutex, matching the type name passed
* to ap_mutex_register().
Modified: httpd/httpd/trunk/include/util_script.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/util_script.h?rev=1174748&r1=1174747&r2=1174748&view=diff
==============================================================================
--- httpd/httpd/trunk/include/util_script.h (original)
+++ httpd/httpd/trunk/include/util_script.h Fri Sep 23 13:38:09 2011
@@ -63,7 +63,7 @@ AP_DECLARE(char **) ap_create_environmen
AP_DECLARE(int) ap_find_path_info(const char *uri, const char *path_info);
/**
- * Add CGI environment variables required by HTTP/1.1 to the request's
+ * Add CGI environment variables required by HTTP/1.1 to the request's
* environment table
* @param r the current request
* @fn void ap_add_cgi_vars(request_rec *r)
@@ -84,10 +84,10 @@ AP_DECLARE(void) ap_add_common_vars(requ
* @param r The current request
* @param f The file to read from
* @param buffer Empty when calling the function. On output, if there was an
- * error, the string that cause the error is stored here.
+ * error, the string that cause the error is stored here.
* @return HTTP_OK on success, HTTP_INTERNAL_SERVER_ERROR otherwise
* @fn int ap_scan_script_header_err(request_rec *r, apr_file_t *f, char *buffer)
- */
+ */
AP_DECLARE(int) ap_scan_script_header_err(request_rec *r, apr_file_t *f, char *buffer);
/**
@@ -112,10 +112,10 @@ AP_DECLARE(int) ap_scan_script_header_er
* @param r The current request
* @param bb The brigade from which to read
* @param buffer Empty when calling the function. On output, if there was an
- * error, the string that cause the error is stored here.
+ * error, the string that cause the error is stored here.
* @return HTTP_OK on success, HTTP_INTERNAL_SERVER_ERROR otherwise
* @fn int ap_scan_script_header_err_brigade(request_rec *r, apr_bucket_brigade *bb, char *buffer)
- */
+ */
AP_DECLARE(int) ap_scan_script_header_err_brigade(request_rec *r,
apr_bucket_brigade *bb,
char *buffer);
@@ -142,17 +142,17 @@ AP_DECLARE(int) ap_scan_script_header_er
* current request
* @param r The current request
* @param buffer Empty when calling the function. On output, if there was an
- * error, the string that cause the error is stored here.
+ * error, the string that cause the error is stored here.
* @param termch Pointer to the last character parsed.
* @param termarg Pointer to an int to capture the last argument parsed.
- *
- * The varargs are string arguments to parse consecutively for headers,
+ *
+ * The varargs are string arguments to parse consecutively for headers,
* with a NULL argument to terminate the list.
*
* @return HTTP_OK on success, HTTP_INTERNAL_SERVER_ERROR otherwise
- */
-AP_DECLARE_NONSTD(int) ap_scan_script_header_err_strs(request_rec *r,
- char *buffer,
+ */
+AP_DECLARE_NONSTD(int) ap_scan_script_header_err_strs(request_rec *r,
+ char *buffer,
const char **termch,
int *termarg, ...)
ap_func_attr_sentinel;
@@ -187,12 +187,12 @@ AP_DECLARE_NONSTD(int) ap_scan_script_he
* current request
* @param r The current request
* @param buffer Empty when calling the function. On output, if there was an
- * error, the string that cause the error is stored here.
+ * error, the string that cause the error is stored here.
* @param getsfunc Function to read the headers from. This function should
act like gets()
* @param getsfunc_data The place to read from
* @return HTTP_OK on success, HTTP_INTERNAL_SERVER_ERROR otherwise
- */
+ */
AP_DECLARE(int) ap_scan_script_header_err_core(request_rec *r, char *buffer,
int (*getsfunc) (char *, int, void *),
void *getsfunc_data);
Modified: httpd/httpd/trunk/include/util_time.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/util_time.h?rev=1174748&r1=1174747&r2=1174748&view=diff
==============================================================================
--- httpd/httpd/trunk/include/util_time.h (original)
+++ httpd/httpd/trunk/include/util_time.h Fri Sep 23 13:38:09 2011
@@ -81,7 +81,7 @@ AP_DECLARE(apr_status_t) ap_explode_rece
/**
* format a recent timestamp in the ctime() format.
* @param date_str String to write to.
- * @param t the time to convert
+ * @param t the time to convert
* @note Consider using ap_recent_ctime_ex instead.
* @return APR_SUCCESS iff successful
*/
@@ -91,7 +91,7 @@ AP_DECLARE(apr_status_t) ap_recent_ctime
/**
* format a recent timestamp in an extended ctime() format.
* @param date_str String to write to.
- * @param t the time to convert
+ * @param t the time to convert
* @param option Additional formatting options (AP_CTIME_OPTION_*).
* @param len Pointer to an int containing the length of the provided buffer.
* On successful return it contains the number of bytes written to the
@@ -105,7 +105,7 @@ AP_DECLARE(apr_status_t) ap_recent_ctime
/**
* format a recent timestamp in the RFC822 format
* @param date_str String to write to (must have length >= APR_RFC822_DATE_LEN)
- * @param t the time to convert
+ * @param t the time to convert
*/
AP_DECLARE(apr_status_t) ap_recent_rfc822_date(char *date_str, apr_time_t t);
Modified: httpd/httpd/trunk/modules/aaa/mod_authz_dbd.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authz_dbd.h?rev=1174748&r1=1174747&r2=1174748&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authz_dbd.h (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authz_dbd.h Fri Sep 23 13:38:09 2011
@@ -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)
Modified: httpd/httpd/trunk/modules/arch/unix/mod_unixd.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/arch/unix/mod_unixd.h?rev=1174748&r1=1174747&r2=1174748&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/arch/unix/mod_unixd.h (original)
+++ httpd/httpd/trunk/modules/arch/unix/mod_unixd.h Fri Sep 23 13:38:09 2011
@@ -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
* @{
Modified: httpd/httpd/trunk/modules/arch/win32/mod_isapi.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/arch/win32/mod_isapi.h?rev=1174748&r1=1174747&r2=1174748&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/arch/win32/mod_isapi.h (original)
+++ httpd/httpd/trunk/modules/arch/win32/mod_isapi.h Fri Sep 23 13:38:09 2011
@@ -48,24 +48,24 @@ typedef int (APR_THREAD_FUNC *PFN_GETEXT
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);
Modified: httpd/httpd/trunk/modules/cache/cache_cache.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/cache_cache.h?rev=1174748&r1=1174747&r2=1174748&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/cache_cache.h (original)
+++ httpd/httpd/trunk/modules/cache/cache_cache.h Fri Sep 23 13:38:09 2011
@@ -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
* @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)
*/
Modified: httpd/httpd/trunk/modules/cache/cache_hash.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/cache_hash.h?rev=1174748&r1=1174747&r2=1174748&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/cache_hash.h (original)
+++ httpd/httpd/trunk/modules/cache/cache_hash.h Fri Sep 23 13:38:09 2011
@@ -56,7 +56,7 @@ typedef struct cache_hash_index_t cache_
/**
* 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
* @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(cac
/**
* 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(cach
* @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);
/**
Modified: httpd/httpd/trunk/modules/cache/cache_pqueue.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/cache_pqueue.h?rev=1174748&r1=1174747&r2=1174748&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/cache_pqueue.h (original)
+++ httpd/httpd/trunk/modules/cache/cache_pqueue.h Fri Sep 23 13:38:09 2011
@@ -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);
Modified: httpd/httpd/trunk/modules/core/mod_so.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/mod_so.h?rev=1174748&r1=1174747&r2=1174748&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/core/mod_so.h (original)
+++ httpd/httpd/trunk/modules/core/mod_so.h Fri Sep 23 13:38:09 2011
@@ -17,7 +17,7 @@
/**
* @file mod_so.h
* @brief Shared Object Loader Extension Module for Apache
- *
+ *
* @defgroup MOD_SO mod_so
* @ingroup APACHE_MODS
* @{
Modified: httpd/httpd/trunk/modules/core/mod_watchdog.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/mod_watchdog.h?rev=1174748&r1=1174747&r2=1174748&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/core/mod_watchdog.h (original)
+++ httpd/httpd/trunk/modules/core/mod_watchdog.h Fri Sep 23 13:38:09 2011
@@ -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 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 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 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
/**
* 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.
*/
Modified: httpd/httpd/trunk/modules/database/mod_dbd.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/database/mod_dbd.h?rev=1174748&r1=1174747&r2=1174748&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/database/mod_dbd.h (original)
+++ httpd/httpd/trunk/modules/database/mod_dbd.h Fri Sep 23 13:38:09 2011
@@ -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)
Modified: httpd/httpd/trunk/modules/filters/libsed.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/libsed.h?rev=1174748&r1=1174747&r2=1174748&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/libsed.h (original)
+++ httpd/httpd/trunk/modules/filters/libsed.h Fri Sep 23 13:38:09 2011
@@ -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
Modified: httpd/httpd/trunk/modules/filters/mod_include.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_include.h?rev=1174748&r1=1174747&r2=1174748&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_include.h (original)
+++ httpd/httpd/trunk/modules/filters/mod_include.h Fri Sep 23 13:38:09 2011
@@ -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_pa
(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 */
Modified: httpd/httpd/trunk/modules/filters/mod_ratelimit.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_ratelimit.h?rev=1174748&r1=1174747&r2=1174748&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_ratelimit.h (original)
+++ httpd/httpd/trunk/modules/filters/mod_ratelimit.h Fri Sep 23 13:38:09 2011
@@ -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)
Modified: httpd/httpd/trunk/modules/filters/regexp.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/regexp.h?rev=1174748&r1=1174747&r2=1174748&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/regexp.h (original)
+++ httpd/httpd/trunk/modules/filters/regexp.h Fri Sep 23 13:38:09 2011
@@ -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
Modified: httpd/httpd/trunk/modules/filters/sed.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/sed.h?rev=1174748&r1=1174747&r2=1174748&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/sed.h (original)
+++ httpd/httpd/trunk/modules/filters/sed.h Fri Sep 23 13:38:09 2011
@@ -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
Modified: httpd/httpd/trunk/modules/generators/mod_cgi.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/generators/mod_cgi.h?rev=1174748&r1=1174747&r2=1174748&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/generators/mod_cgi.h (original)
+++ httpd/httpd/trunk/modules/generators/mod_cgi.h Fri Sep 23 13:38:09 2011
@@ -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 */
Modified: httpd/httpd/trunk/modules/generators/mod_suexec.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/generators/mod_suexec.h?rev=1174748&r1=1174747&r2=1174748&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/generators/mod_suexec.h (original)
+++ httpd/httpd/trunk/modules/generators/mod_suexec.h Fri Sep 23 13:38:09 2011
@@ -17,7 +17,7 @@
/**
* @file mod_suexec.h
* @brief SuExec Extension Module for Apache
- *
+ *
* @defgroup MOD_SUEXEC mod_suexec
* @ingroup APACHE_MODS
* @{
Modified: httpd/httpd/trunk/modules/ldap/util_ldap_cache.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ldap/util_ldap_cache.h?rev=1174748&r1=1174747&r2=1174748&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ldap/util_ldap_cache.h (original)
+++ httpd/httpd/trunk/modules/ldap/util_ldap_cache.h Fri Sep 23 13:38:09 2011
@@ -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
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);
Modified: httpd/httpd/trunk/modules/loggers/mod_log_config.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/loggers/mod_log_config.h?rev=1174748&r1=1174747&r2=1174748&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/loggers/mod_log_config.h (original)
+++ httpd/httpd/trunk/modules/loggers/mod_log_config.h Fri Sep 23 13:38:09 2011
@@ -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(
/**
* 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));
Modified: httpd/httpd/trunk/modules/lua/lua_vmprep.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/lua/lua_vmprep.h?rev=1174748&r1=1174747&r2=1174748&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/lua/lua_vmprep.h (original)
+++ httpd/httpd/trunk/modules/lua/lua_vmprep.h Fri Sep 23 13:38:09 2011
@@ -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
* 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
Modified: httpd/httpd/trunk/modules/lua/mod_lua.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/lua/mod_lua.h?rev=1174748&r1=1174747&r2=1174748&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/lua/mod_lua.h (original)
+++ httpd/httpd/trunk/modules/lua/mod_lua.h Fri Sep 23 13:38:09 2011
@@ -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;
Modified: httpd/httpd/trunk/modules/mappers/mod_rewrite.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/mod_rewrite.h?rev=1174748&r1=1174747&r2=1174748&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/mod_rewrite.h (original)
+++ httpd/httpd/trunk/modules/mappers/mod_rewrite.h Fri Sep 23 13:38:09 2011
@@ -17,7 +17,7 @@
/**
* @file mod_rewrite.h
* @brief Rewrite Extension module for Apache
- *
+ *
* @defgroup MOD_REWRITE mod_rewrite
* @ingroup APACHE_MODS
* @{
Modified: httpd/httpd/trunk/modules/proxy/ajp.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/ajp.h?rev=1174748&r1=1174747&r2=1174748&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/ajp.h (original)
+++ httpd/httpd/trunk/modules/proxy/ajp.h Fri Sep 23 13:38:09 2011
@@ -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_m
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_ms
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 *sms
*/
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 *po
*/
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,
*/
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_poo
* 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_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_
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
apr_byte_t *reuse);
-/**
+/**
* Handle the CPING/CPONG messages
* @param sock backend socket
* @param r current request
Modified: httpd/httpd/trunk/modules/proxy/ajp_header.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/ajp_header.h?rev=1174748&r1=1174747&r2=1174748&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/ajp_header.h (original)
+++ httpd/httpd/trunk/modules/proxy/ajp_header.h Fri Sep 23 13:38:09 2011
@@ -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
Modified: httpd/httpd/trunk/modules/proxy/mod_serf.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_serf.h?rev=1174748&r1=1174747&r2=1174748&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_serf.h (original)
+++ httpd/httpd/trunk/modules/proxy/mod_serf.h Fri Sep 23 13:38:09 2011
@@ -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.
Modified: httpd/httpd/trunk/modules/session/mod_session.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/session/mod_session.h?rev=1174748&r1=1174747&r2=1174748&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/session/mod_session.h (original)
+++ httpd/httpd/trunk/modules/session/mod_session.h Fri Sep 23 13:38:09 2011
@@ -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)
Modified: httpd/httpd/trunk/modules/ssl/mod_ssl.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/mod_ssl.h?rev=1174748&r1=1174747&r2=1174748&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/mod_ssl.h (original)
+++ httpd/httpd/trunk/modules/ssl/mod_ssl.h Fri Sep 23 13:38:09 2011
@@ -37,9 +37,9 @@ APR_DECLARE_OPTIONAL_FN(char *, ssl_var_
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,
Modified: httpd/httpd/trunk/modules/ssl/ssl_private.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_private.h?rev=1174748&r1=1174747&r2=1174748&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_private.h (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_private.h Fri Sep 23 13:38:09 2011
@@ -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
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
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 cha
* 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
/* 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
Modified: httpd/httpd/trunk/modules/ssl/ssl_util_ssl.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_util_ssl.h?rev=1174748&r1=1174747&r2=1174748&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_util_ssl.h (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_util_ssl.h Fri Sep 23 13:38:09 2011
@@ -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);
Modified: httpd/httpd/trunk/os/netware/os.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/os/netware/os.h?rev=1174748&r1=1174747&r2=1174748&view=diff
==============================================================================
--- httpd/httpd/trunk/os/netware/os.h (original)
+++ httpd/httpd/trunk/os/netware/os.h Fri Sep 23 13:38:09 2011
@@ -49,7 +49,7 @@ AP_DECLARE_DATA extern int hold_screen_o
#define getpid NXThreadGetId
/* Hold the screen open if there is an exit code and the hold_screen_on_exit flag >= 0 or the
- hold_screen_on_exit > 0. If the hold_screen_on_exit flag is < 0 then close the screen no
+ hold_screen_on_exit > 0. If the hold_screen_on_exit flag is < 0 then close the screen no
matter what the exit code is. */
#define exit(s) {if((s||hold_screen_on_exit)&&(hold_screen_on_exit>=0)){pressanykey();}apr_terminate();exit(s);}
Modified: httpd/httpd/trunk/os/netware/pre_nw.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/os/netware/pre_nw.h?rev=1174748&r1=1174747&r2=1174748&view=diff
==============================================================================
--- httpd/httpd/trunk/os/netware/pre_nw.h (original)
+++ httpd/httpd/trunk/os/netware/pre_nw.h Fri Sep 23 13:38:09 2011
@@ -38,12 +38,12 @@
/* hint for MSL C++ that we're on NetWare platform */
#define __NETWARE__
-/* the FAR keyword has no meaning in a 32-bit environment
+/* the FAR keyword has no meaning in a 32-bit environment
but is used in the SDK headers so we take it out */
#define FAR
#define far
-/* no-op for Codewarrior C compiler; a functions are cdecl
+/* no-op for Codewarrior C compiler; a functions are cdecl
by default */
#define cdecl
Modified: httpd/httpd/trunk/os/unix/unixd.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/os/unix/unixd.h?rev=1174748&r1=1174747&r2=1174748&view=diff
==============================================================================
--- httpd/httpd/trunk/os/unix/unixd.h (original)
+++ httpd/httpd/trunk/os/unix/unixd.h Fri Sep 23 13:38:09 2011
@@ -16,7 +16,7 @@
/**
* @file unixd.h
- * @brief common stuff that unix MPMs will want
+ * @brief common stuff that unix MPMs will want
*
* @addtogroup APACHE_OS_UNIX
* @{
@@ -83,13 +83,13 @@ AP_DECLARE_DATA extern unixd_config_rec
#if defined(RLIMIT_CPU) || defined(RLIMIT_DATA) || defined(RLIMIT_VMEM) || defined(RLIMIT_NPROC) || defined(RLIMIT_AS)
AP_DECLARE(void) ap_unixd_set_rlimit(cmd_parms *cmd, struct rlimit **plimit,
- const char *arg,
+ const char *arg,
const char * arg2, int type);
#endif
/**
* One of the functions to set mutex permissions should be called in
- * the parent process on platforms that switch identity when the
+ * the parent process on platforms that switch identity when the
* server is started as root.
* If the child init logic is performed before switching identity
* (e.g., MPM setup for an accept mutex), it should only be called
Modified: httpd/httpd/trunk/os/win32/os.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/os/win32/os.h?rev=1174748&r1=1174747&r2=1174748&view=diff
==============================================================================
--- httpd/httpd/trunk/os/win32/os.h (original)
+++ httpd/httpd/trunk/os/win32/os.h Fri Sep 23 13:38:09 2011
@@ -19,7 +19,7 @@
* @brief This file in included in all Apache source code. It contains definitions
* of facilities available on _this_ operating system (HAVE_* macros),
* and prototypes of OS specific functions defined in os.c or os-inline.c
- *
+ *
* @defgroup APACHE_OS_WIN32 win32
* @ingroup APACHE_OS
* @{
@@ -107,8 +107,8 @@ void CleanNullACL(void *sa);
/* Win2K kernel only */
AP_DECLARE_LATE_DLL_FUNC(AP_DLL_WINADVAPI, BOOL, WINAPI, ChangeServiceConfig2A, 0, (
- SC_HANDLE hService,
- DWORD dwInfoLevel,
+ SC_HANDLE hService,
+ DWORD dwInfoLevel,
LPVOID lpInfo),
(hService, dwInfoLevel, lpInfo));
#undef ChangeServiceConfig2
Modified: httpd/httpd/trunk/server/mpm/event/fdqueue.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/event/fdqueue.h?rev=1174748&r1=1174747&r2=1174748&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/event/fdqueue.h (original)
+++ httpd/httpd/trunk/server/mpm/event/fdqueue.h Fri Sep 23 13:38:09 2011
@@ -85,7 +85,7 @@ struct fd_queue_t
typedef struct fd_queue_t fd_queue_t;
void ap_pop_pool(apr_pool_t ** recycled_pool, fd_queue_info_t * queue_info);
-void ap_push_pool(fd_queue_info_t * queue_info,
+void ap_push_pool(fd_queue_info_t * queue_info,
apr_pool_t * pool_to_recycle);
apr_status_t ap_queue_init(fd_queue_t * queue, int queue_capacity,
Modified: httpd/httpd/trunk/server/mpm/mpmt_os2/mpm_default.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/mpmt_os2/mpm_default.h?rev=1174748&r1=1174747&r2=1174748&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/mpmt_os2/mpm_default.h (original)
+++ httpd/httpd/trunk/server/mpm/mpmt_os2/mpm_default.h Fri Sep 23 13:38:09 2011
@@ -17,7 +17,7 @@
/**
* @file mpmt_os2/mpm_default.h
* @brief os2 MPM defaults
- *
+ *
* @addtogroup APACHE_MPM_OS2
* @{
*/
Modified: httpd/httpd/trunk/server/mpm/simple/simple_event.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/simple/simple_event.h?rev=1174748&r1=1174747&r2=1174748&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/simple/simple_event.h (original)
+++ httpd/httpd/trunk/server/mpm/simple/simple_event.h Fri Sep 23 13:38:09 2011
@@ -28,7 +28,7 @@ void
simple_register_timer(simple_core_t * sc,
simple_timer_cb cb,
void *baton,
- apr_time_t relative_time,
+ apr_time_t relative_time,
apr_pool_t *shutdown_pool);
void
Modified: httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.h?rev=1174748&r1=1174747&r2=1174748&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.h (original)
+++ httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.h Fri Sep 23 13:38:09 2011
@@ -16,7 +16,7 @@
/**
* @file mpm_winnt.h
- * @brief WinNT MPM specific
+ * @brief WinNT MPM specific
*
* @addtogroup APACHE_MPM_WINNT
* @{
@@ -39,18 +39,18 @@
#define SERVICECONFIG "System\\CurrentControlSet\\Services\\%s"
#define SERVICEPARAMS "System\\CurrentControlSet\\Services\\%s\\Parameters"
-apr_status_t mpm_service_set_name(apr_pool_t *p, const char **display_name,
+apr_status_t mpm_service_set_name(apr_pool_t *p, const char **display_name,
const char *set_name);
-apr_status_t mpm_merge_service_args(apr_pool_t *p, apr_array_header_t *args,
+apr_status_t mpm_merge_service_args(apr_pool_t *p, apr_array_header_t *args,
int fixed_args);
apr_status_t mpm_service_to_start(const char **display_name, apr_pool_t *p);
apr_status_t mpm_service_started(void);
-apr_status_t mpm_service_install(apr_pool_t *ptemp, int argc,
+apr_status_t mpm_service_install(apr_pool_t *ptemp, int argc,
char const* const* argv, int reconfig);
apr_status_t mpm_service_uninstall(void);
-apr_status_t mpm_service_start(apr_pool_t *ptemp, int argc,
+apr_status_t mpm_service_start(apr_pool_t *ptemp, int argc,
char const* const* argv);
void mpm_signal_service(apr_pool_t *ptemp, int signal);
Modified: httpd/httpd/trunk/server/util_expr_parse.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/util_expr_parse.h?rev=1174748&r1=1174747&r2=1174748&view=diff
==============================================================================
--- httpd/httpd/trunk/server/util_expr_parse.h (original)
+++ httpd/httpd/trunk/server/util_expr_parse.h Fri Sep 23 13:38:09 2011
@@ -2,20 +2,20 @@
/* A Bison parser, made by GNU Bison 2.4.1. */
/* Skeleton interface for Bison's Yacc-like parsers in C
-
+
Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
Free Software Foundation, Inc.
-
+
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
@@ -28,7 +28,7 @@
special exception, which will cause the skeleton and the resulting
Bison output files to be licensed under the GNU General Public
License without this special exception.
-
+
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
Modified: httpd/httpd/trunk/support/suexec.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/support/suexec.h?rev=1174748&r1=1174747&r2=1174748&view=diff
==============================================================================
--- httpd/httpd/trunk/support/suexec.h (original)
+++ httpd/httpd/trunk/support/suexec.h Fri Sep 23 13:38:09 2011
@@ -56,15 +56,15 @@
#endif
/*
- * USERDIR_SUFFIX -- Define to be the subdirectory under users'
+ * USERDIR_SUFFIX -- Define to be the subdirectory under users'
* home directories where suEXEC access should
* be allowed. All executables under this directory
- * will be executable by suEXEC as the user so
- * they should be "safe" programs. If you are
- * using a "simple" UserDir directive (ie. one
- * without a "*" in it) this should be set to
+ * will be executable by suEXEC as the user so
+ * they should be "safe" programs. If you are
+ * using a "simple" UserDir directive (ie. one
+ * without a "*" in it) this should be set to
* the same value. suEXEC will not work properly
- * in cases where the UserDir directive points to
+ * in cases where the UserDir directive points to
* a location that is not the same as the user's
* home directory as referenced in the passwd file.
*