httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1174751 [1/4] - in /httpd/httpd/trunk: modules/aaa/ modules/arch/netware/ modules/arch/unix/ modules/arch/win32/ modules/cache/ modules/cluster/ modules/core/ modules/dav/fs/ modules/dav/main/ modules/echo/ modules/examples/ modules/experi...
Date Fri, 23 Sep 2011 13:39:35 GMT
Author: jim
Date: Fri Sep 23 13:39:32 2011
New Revision: 1174751

URL: http://svn.apache.org/viewvc?rev=1174751&view=rev
Log:
Cleanup effort in prep for GA push:
Trim trailing whitespace... no func change


Modified:
    httpd/httpd/trunk/modules/aaa/mod_allowmethods.c
    httpd/httpd/trunk/modules/aaa/mod_auth_digest.c
    httpd/httpd/trunk/modules/aaa/mod_authn_socache.c
    httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c
    httpd/httpd/trunk/modules/aaa/mod_authz_core.c
    httpd/httpd/trunk/modules/aaa/mod_authz_dbd.c
    httpd/httpd/trunk/modules/aaa/mod_authz_dbm.c
    httpd/httpd/trunk/modules/aaa/mod_authz_host.c
    httpd/httpd/trunk/modules/arch/netware/mod_netware.c
    httpd/httpd/trunk/modules/arch/unix/mod_unixd.c
    httpd/httpd/trunk/modules/arch/win32/mod_isapi.c
    httpd/httpd/trunk/modules/cache/mod_socache_dbm.c
    httpd/httpd/trunk/modules/cache/mod_socache_dc.c
    httpd/httpd/trunk/modules/cache/mod_socache_memcache.c
    httpd/httpd/trunk/modules/cache/mod_socache_shmcb.c
    httpd/httpd/trunk/modules/cluster/mod_heartmonitor.c
    httpd/httpd/trunk/modules/core/mod_so.c
    httpd/httpd/trunk/modules/dav/fs/repos.c
    httpd/httpd/trunk/modules/dav/main/mod_dav.c
    httpd/httpd/trunk/modules/dav/main/util.c
    httpd/httpd/trunk/modules/echo/mod_echo.c
    httpd/httpd/trunk/modules/examples/mod_case_filter.c
    httpd/httpd/trunk/modules/examples/mod_example_hooks.c
    httpd/httpd/trunk/modules/examples/mod_example_ipc.c
    httpd/httpd/trunk/modules/experimental/mod_noloris.c
    httpd/httpd/trunk/modules/filters/mod_buffer.c
    httpd/httpd/trunk/modules/filters/mod_charset_lite.c
    httpd/httpd/trunk/modules/filters/mod_data.c
    httpd/httpd/trunk/modules/filters/mod_deflate.c
    httpd/httpd/trunk/modules/filters/mod_filter.c
    httpd/httpd/trunk/modules/filters/mod_include.c
    httpd/httpd/trunk/modules/filters/mod_reqtimeout.c
    httpd/httpd/trunk/modules/filters/mod_sed.c
    httpd/httpd/trunk/modules/filters/mod_substitute.c
    httpd/httpd/trunk/modules/filters/regexp.c
    httpd/httpd/trunk/modules/filters/sed0.c
    httpd/httpd/trunk/modules/filters/sed1.c
    httpd/httpd/trunk/modules/generators/mod_autoindex.c
    httpd/httpd/trunk/modules/generators/mod_cgi.c
    httpd/httpd/trunk/modules/generators/mod_cgid.c
    httpd/httpd/trunk/modules/generators/mod_status.c
    httpd/httpd/trunk/modules/http/byterange_filter.c
    httpd/httpd/trunk/modules/http/http_core.c
    httpd/httpd/trunk/modules/http/http_filters.c
    httpd/httpd/trunk/modules/http/http_protocol.c
    httpd/httpd/trunk/modules/http/http_request.c
    httpd/httpd/trunk/modules/ldap/util_ldap.c
    httpd/httpd/trunk/modules/loggers/mod_log_config.c
    httpd/httpd/trunk/modules/loggers/mod_log_forensic.c
    httpd/httpd/trunk/modules/lua/lua_request.c
    httpd/httpd/trunk/modules/lua/lua_vmprep.c
    httpd/httpd/trunk/modules/lua/mod_lua.c
    httpd/httpd/trunk/modules/mappers/mod_dir.c
    httpd/httpd/trunk/modules/mappers/mod_imagemap.c
    httpd/httpd/trunk/modules/mappers/mod_rewrite.c
    httpd/httpd/trunk/modules/mappers/mod_speling.c
    httpd/httpd/trunk/modules/mappers/mod_userdir.c
    httpd/httpd/trunk/modules/metadata/mod_remoteip.c
    httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_bybusyness.c
    httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_byrequests.c
    httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_heartbeat.c
    httpd/httpd/trunk/modules/proxy/examples/mod_lbmethod_rr.c
    httpd/httpd/trunk/modules/proxy/mod_proxy.c
    httpd/httpd/trunk/modules/proxy/mod_proxy_ajp.c
    httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c
    httpd/httpd/trunk/modules/proxy/mod_proxy_connect.c
    httpd/httpd/trunk/modules/proxy/mod_proxy_express.c
    httpd/httpd/trunk/modules/proxy/mod_proxy_fcgi.c
    httpd/httpd/trunk/modules/proxy/mod_proxy_fdpass.c
    httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c
    httpd/httpd/trunk/modules/proxy/mod_proxy_http.c
    httpd/httpd/trunk/modules/proxy/mod_proxy_scgi.c
    httpd/httpd/trunk/modules/proxy/mod_serf.c
    httpd/httpd/trunk/modules/slotmem/mod_slotmem_plain.c
    httpd/httpd/trunk/modules/ssl/ssl_engine_config.c
    httpd/httpd/trunk/modules/ssl/ssl_engine_init.c
    httpd/httpd/trunk/modules/ssl/ssl_engine_io.c
    httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c
    httpd/httpd/trunk/modules/ssl/ssl_engine_log.c
    httpd/httpd/trunk/modules/ssl/ssl_engine_ocsp.c
    httpd/httpd/trunk/modules/ssl/ssl_engine_pphrase.c
    httpd/httpd/trunk/modules/ssl/ssl_engine_vars.c
    httpd/httpd/trunk/modules/ssl/ssl_scache.c
    httpd/httpd/trunk/modules/ssl/ssl_util.c
    httpd/httpd/trunk/modules/ssl/ssl_util_ocsp.c
    httpd/httpd/trunk/modules/ssl/ssl_util_ssl.c
    httpd/httpd/trunk/modules/ssl/ssl_util_stapling.c
    httpd/httpd/trunk/modules/test/mod_dialup.c
    httpd/httpd/trunk/server/config.c
    httpd/httpd/trunk/server/log.c
    httpd/httpd/trunk/server/main.c
    httpd/httpd/trunk/server/mpm/event/event.c
    httpd/httpd/trunk/server/mpm/event/fdqueue.c
    httpd/httpd/trunk/server/mpm/prefork/prefork.c
    httpd/httpd/trunk/server/mpm/simple/simple_children.c
    httpd/httpd/trunk/server/mpm/simple/simple_core.c
    httpd/httpd/trunk/server/mpm/simple/simple_io.c
    httpd/httpd/trunk/server/mpm/simple/simple_run.c
    httpd/httpd/trunk/server/mpm/winnt/child.c
    httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c
    httpd/httpd/trunk/server/mpm/winnt/nt_eventlog.c
    httpd/httpd/trunk/server/mpm/winnt/service.c
    httpd/httpd/trunk/server/mpm/worker/worker.c
    httpd/httpd/trunk/server/mpm_unix.c
    httpd/httpd/trunk/server/protocol.c
    httpd/httpd/trunk/server/request.c
    httpd/httpd/trunk/server/util.c
    httpd/httpd/trunk/server/util_expr_eval.c
    httpd/httpd/trunk/server/util_expr_parse.c
    httpd/httpd/trunk/server/util_expr_scan.c
    httpd/httpd/trunk/server/util_mutex.c
    httpd/httpd/trunk/server/util_pcre.c
    httpd/httpd/trunk/server/util_script.c
    httpd/httpd/trunk/server/vhost.c
    httpd/httpd/trunk/support/ab.c
    httpd/httpd/trunk/support/htcacheclean.c
    httpd/httpd/trunk/support/htpasswd.c
    httpd/httpd/trunk/support/rotatelogs.c
    httpd/httpd/trunk/support/win32/ApacheMonitor.c

Modified: httpd/httpd/trunk/modules/aaa/mod_allowmethods.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_allowmethods.c?rev=1174751&r1=1174750&r2=1174751&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_allowmethods.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_allowmethods.c Fri Sep 23 13:39:32 2011
@@ -38,7 +38,7 @@
  *      AllowMethods GET HEAD OPTIONS POST
  *   </Directory>
  *  Non-matching methods will be returned a status 405 (method not allowed)
- *  
+ *
  *  To allow all methods, and effectively turn off mod_allowmethods, use:
  *    AllowMethods reset
  */
@@ -54,32 +54,32 @@ static int am_check_access(request_rec *
 {
   int method = r->method_number;
   am_conf_t *conf;
-  
+
   conf = (am_conf_t *) ap_get_module_config(r->per_dir_config,
                                             &allowmethods_module);
   if (!conf || conf->allowed == 0) {
     return DECLINED;
   }
-  
+
   r->allowed = conf->allowed;
 
   if (conf->allowed & (AP_METHOD_BIT << method)) {
     return DECLINED;
   }
-  
+
   ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                   "client method denied by server configuration: '%s' to %s%s",
                   r->method,
                   r->filename ? "" : "uri ",
                   r->filename ? r->filename : r->uri);
-  
+
   return HTTP_METHOD_NOT_ALLOWED;
 }
 
 static void *am_create_conf(apr_pool_t * p, char *dummy)
 {
   am_conf_t *conf = apr_pcalloc(p, sizeof(am_conf_t));
-  
+
   conf->allowed = 0;
   conf->allowed_set = 0;
   return conf;
@@ -89,7 +89,7 @@ static void* am_merge_conf(apr_pool_t* p
   am_conf_t* base = (am_conf_t*) a;
   am_conf_t* add = (am_conf_t*) b;
   am_conf_t* conf = apr_palloc(pool, sizeof(am_conf_t));
-  
+
   if (add->allowed_set) {
       conf->allowed = add->allowed;
       conf->allowed_set = add->allowed_set;

Modified: httpd/httpd/trunk/modules/aaa/mod_auth_digest.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_auth_digest.c?rev=1174751&r1=1174750&r2=1174751&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_auth_digest.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_auth_digest.c Fri Sep 23 13:39:32 2011
@@ -267,13 +267,13 @@ static int initialize_tables(server_rec 
 {
     unsigned long idx;
     apr_status_t   sts;
-    const char *tempdir; 
+    const char *tempdir;
 
     /* set up client list */
 
     sts = apr_temp_dir_get(&tempdir, ctx);
     if (APR_SUCCESS != sts) {
-        ap_log_error(APLOG_MARK, APLOG_ERR, sts, s, 
+        ap_log_error(APLOG_MARK, APLOG_ERR, sts, s,
                      "Failed to find temporary directory");
         log_error_and_cleanup("failed to find temp dir", sts, s);
         return HTTP_INTERNAL_SERVER_ERROR;
@@ -281,19 +281,19 @@ static int initialize_tables(server_rec 
 
     /* Create the shared memory segment */
 
-    /* 
-     * Create a unique filename using our pid. This information is 
+    /*
+     * Create a unique filename using our pid. This information is
      * stashed in the global variable so the children inherit it.
      */
-    client_shm_filename = apr_psprintf(ctx, "%s/authdigest_shm.%"APR_PID_T_FMT, tempdir, 
+    client_shm_filename = apr_psprintf(ctx, "%s/authdigest_shm.%"APR_PID_T_FMT, tempdir,
                                        getpid());
 
     /* Now create that segment */
     sts = apr_shm_create(&client_shm, shmem_size,
                         client_shm_filename, ctx);
     if (APR_SUCCESS != sts) {
-        ap_log_error(APLOG_MARK, APLOG_ERR, sts, s, 
-                     "Failed to create shared memory segment on file %s", 
+        ap_log_error(APLOG_MARK, APLOG_ERR, sts, s,
+                     "Failed to create shared memory segment on file %s",
                      client_shm_filename);
         log_error_and_cleanup("failed to initialize shm", sts, s);
         return HTTP_INTERNAL_SERVER_ERROR;
@@ -672,7 +672,7 @@ static const char *set_shmem_size(cmd_pa
         num_buckets = 1;
     }
     ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, cmd->server,
-                 "Digest: Set shmem-size: %" APR_SIZE_T_FMT ", num-buckets: %ld", 
+                 "Digest: Set shmem-size: %" APR_SIZE_T_FMT ", num-buckets: %ld",
                  shmem_size, num_buckets);
 
     return NULL;

Modified: httpd/httpd/trunk/modules/aaa/mod_authn_socache.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authn_socache.c?rev=1174751&r1=1174750&r2=1174751&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authn_socache.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authn_socache.c Fri Sep 23 13:39:32 2011
@@ -314,7 +314,7 @@ static authn_status check_password(reque
     /* construct key
      * look it up
      * if found, test password
-     * 
+     *
      * mutexing here would be a big performance drag.
      * It's definitely unnecessary with some backends (like ndbm or gdbm)
      * Is there a risk in the general case?  I guess the only risk we

Modified: httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c?rev=1174751&r1=1174750&r2=1174751&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c Fri Sep 23 13:39:32 2011
@@ -352,7 +352,7 @@ static apr_status_t authnz_ldap_cleanup_
     return APR_SUCCESS;
 }
 
-static int set_request_vars(request_rec *r, enum auth_ldap_phase phase) { 
+static int set_request_vars(request_rec *r, enum auth_ldap_phase phase) {
     char *prefix = NULL;
     int prefix_len;
     int remote_user_attribute_set = 0;
@@ -379,7 +379,7 @@ static int set_request_vars(request_rec 
 
             /* handle remote_user_attribute, if set */
             if ((phase == LDAP_AUTHN) &&
-                sec->remote_user_attribute && 
+                sec->remote_user_attribute &&
                 !strcmp(sec->remote_user_attribute, sec->attributes[i])) {
                 r->user = (char *)apr_pstrdup(r->pool, vals[i]);
                 remote_user_attribute_set = 1;
@@ -890,7 +890,7 @@ static authz_status ldapgroup_check_auth
                 set_request_vars(r, LDAP_AUTHZ);
                 return AUTHZ_GRANTED;
             }
-            case LDAP_NO_SUCH_ATTRIBUTE: 
+            case LDAP_NO_SUCH_ATTRIBUTE:
             case LDAP_COMPARE_FALSE: {
                 /* nested groups need searches and compares, so grab a new handle */
                 authnz_ldap_cleanup_connection_close(ldc);

Modified: httpd/httpd/trunk/modules/aaa/mod_authz_core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authz_core.c?rev=1174751&r1=1174750&r2=1174751&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authz_core.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authz_core.c Fri Sep 23 13:39:32 2011
@@ -948,7 +948,7 @@ static const char *all_parse_config(cmd_
                                     const void **parsed_require_line)
 {
     /*
-     * If the argument to the 'all' provider is 'granted' then just let 
+     * If the argument to the 'all' provider is 'granted' then just let
      * everybody in. This would be equivalent to the previous syntax of
      * 'allow from all'. If the argument is 'denied' we reject everbody,
      * which is equivalent to 'deny from all'.

Modified: httpd/httpd/trunk/modules/aaa/mod_authz_dbd.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authz_dbd.c?rev=1174751&r1=1174750&r2=1174751&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authz_dbd.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authz_dbd.c Fri Sep 23 13:39:32 2011
@@ -36,7 +36,7 @@ module AP_MODULE_DECLARE_DATA authz_dbd_
  * to deal with those when we successfully login/logout at the server
  *
  * XXX: WHY would this be specific to dbd_authz?  Why wouldn't we track
- * this across all authz user providers in a lower level mod, such as 
+ * this across all authz user providers in a lower level mod, such as
  * mod_auth_basic/digest?
  */
 APR_IMPLEMENT_OPTIONAL_HOOK_RUN_ALL(authz_dbd, AUTHZ_DBD, int, client_login,

Modified: httpd/httpd/trunk/modules/aaa/mod_authz_dbm.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authz_dbm.c?rev=1174751&r1=1174750&r2=1174751&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authz_dbm.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authz_dbm.c Fri Sep 23 13:39:32 2011
@@ -172,7 +172,7 @@ static authz_status dbmgroup_check_autho
             /* no groups available, so exit immediately */
             ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                           "Authorization of user %s to access %s failed, reason: "
-                          "user doesn't appear in DBM group file (%s).", 
+                          "user doesn't appear in DBM group file (%s).",
                           r->user, r->uri, conf->grpfile);
             return AUTHZ_DENIED;
         }
@@ -240,7 +240,7 @@ static authz_status dbmfilegroup_check_a
         /* no groups available, so exit immediately */
         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                       "Authorization of user %s to access %s failed, reason: "
-                      "user doesn't appear in DBM group file (%s).", 
+                      "user doesn't appear in DBM group file (%s).",
                       r->user, r->uri, conf->grpfile);
         return AUTHZ_DENIED;
     }

Modified: httpd/httpd/trunk/modules/aaa/mod_authz_host.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authz_host.c?rev=1174751&r1=1174750&r2=1174751&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authz_host.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authz_host.c Fri Sep 23 13:39:32 2011
@@ -204,7 +204,7 @@ static authz_status local_check_authoriz
                                r->connection->remote_addr)
          || apr_ipsubnet_test(localhost_v4, r->connection->remote_addr)
 #if APR_HAVE_IPV6
-         || apr_ipsubnet_test(localhost_v6, r->connection->remote_addr) 
+         || apr_ipsubnet_test(localhost_v6, r->connection->remote_addr)
 #endif
         )
      {

Modified: httpd/httpd/trunk/modules/arch/netware/mod_netware.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/arch/netware/mod_netware.c?rev=1174751&r1=1174750&r2=1174751&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/arch/netware/mod_netware.c (original)
+++ httpd/httpd/trunk/modules/arch/netware/mod_netware.c Fri Sep 23 13:39:32 2011
@@ -167,7 +167,7 @@ static apr_status_t ap_cgi_build_command
     return APR_SUCCESS;
 }
 
-static int 
+static int
 netware_pre_config(apr_pool_t *pconf, apr_pool_t *plog,
                  apr_pool_t *ptemp)
 {

Modified: httpd/httpd/trunk/modules/arch/unix/mod_unixd.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/arch/unix/mod_unixd.c?rev=1174751&r1=1174750&r2=1174751&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/arch/unix/mod_unixd.c (original)
+++ httpd/httpd/trunk/modules/arch/unix/mod_unixd.c Fri Sep 23 13:39:32 2011
@@ -134,7 +134,7 @@ static int set_group_privs(void)
 }
 
 
-static int 
+static int
 unixd_drop_privileges(apr_pool_t *pool, server_rec *s)
 {
     int rv = set_group_privs();
@@ -230,7 +230,7 @@ unixd_set_user(cmd_parms *cmd, void *dum
     return NULL;
 }
 
-static const char* 
+static const char*
 unixd_set_group(cmd_parms *cmd, void *dummy,
                                          const char *arg)
 {
@@ -244,7 +244,7 @@ unixd_set_group(cmd_parms *cmd, void *du
     return NULL;
 }
 
-static const char* 
+static const char*
 unixd_set_chroot_dir(cmd_parms *cmd, void *dummy,
                     const char *arg)
 {
@@ -282,7 +282,7 @@ unixd_set_suexec(cmd_parms *cmd, void *d
     return NULL;
 }
 
-static int 
+static int
 unixd_pre_config(apr_pool_t *pconf, apr_pool_t *plog,
                  apr_pool_t *ptemp)
 {

Modified: httpd/httpd/trunk/modules/arch/win32/mod_isapi.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/arch/win32/mod_isapi.c?rev=1174751&r1=1174750&r2=1174751&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/arch/win32/mod_isapi.c (original)
+++ httpd/httpd/trunk/modules/arch/win32/mod_isapi.c Fri Sep 23 13:39:32 2011
@@ -763,9 +763,9 @@ static apr_ssize_t send_response_header(
         cid->ecb->dwHttpStatusCode = cid->r->status;
     }
     else {
-        /* None of dwHttpStatusCode, the parser's r->status nor the 
+        /* None of dwHttpStatusCode, the parser's r->status nor the
          * old value of r->status were helpful, and nothing was decoded
-         * from Status: string passed to us.  Let's just say HTTP_OK 
+         * from Status: string passed to us.  Let's just say HTTP_OK
          * and get the data out, this was the isapi dev's oversight.
          */
         cid->r->status = HTTP_OK;
@@ -983,7 +983,7 @@ static int APR_THREAD_FUNC regfnServerSu
               && (file[len - 1] != '/'))
             file = apr_pstrcat(cid->r->pool, subreq->filename, "/", NULL);
         else
-            file = apr_pstrcat(cid->r->pool, subreq->filename, 
+            file = apr_pstrcat(cid->r->pool, subreq->filename,
                                               subreq->path_info, NULL);
 
         ap_destroy_sub_req(subreq);
@@ -1208,9 +1208,9 @@ static int APR_THREAD_FUNC regfnServerSu
             /* XXX: Many authors issue their next HSE_REQ_ASYNC_READ_CLIENT
              * within the completion logic.  An example is MS's own PSDK
              * sample web/iis/extensions/io/ASyncRead.  This potentially
-             * leads to stack exhaustion.  To refactor, the notification 
+             * leads to stack exhaustion.  To refactor, the notification
              * logic needs to move to isapi_handler() - differentiating
-             * the cid->completed event with a new flag to indicate 
+             * the cid->completed event with a new flag to indicate
              * an async-notice versus the async request completed.
              */
             if (res >= 0) {
@@ -1634,7 +1634,7 @@ static apr_status_t isapi_handler (reque
         default:
             ap_log_rerror(APLOG_MARK, APLOG_WARNING, apr_get_os_error(), r,
                           "ISAPI: unrecognized result code %d "
-                          "from HttpExtensionProc(): %s ", 
+                          "from HttpExtensionProc(): %s ",
                           rv, r->filename);
             r->status = HTTP_INTERNAL_SERVER_ERROR;
             break;

Modified: httpd/httpd/trunk/modules/cache/mod_socache_dbm.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_socache_dbm.c?rev=1174751&r1=1174750&r2=1174751&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_socache_dbm.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_socache_dbm.c Fri Sep 23 13:39:32 2011
@@ -71,12 +71,12 @@ struct ap_socache_instance_t {
 
 static void socache_dbm_expire(ap_socache_instance_t *ctx, server_rec *s);
 
-static apr_status_t socache_dbm_remove(ap_socache_instance_t *ctx, 
-                                       server_rec *s, const unsigned char *id, 
+static apr_status_t socache_dbm_remove(ap_socache_instance_t *ctx,
+                                       server_rec *s, const unsigned char *id,
                                        unsigned int idlen, apr_pool_t *p);
 
-static const char *socache_dbm_create(ap_socache_instance_t **context, 
-                                      const char *arg, 
+static const char *socache_dbm_create(ap_socache_instance_t **context,
+                                      const char *arg,
                                       apr_pool_t *tmp, apr_pool_t *p)
 {
     ap_socache_instance_t *ctx;
@@ -95,8 +95,8 @@ static const char *socache_dbm_create(ap
     return NULL;
 }
 
-static apr_status_t socache_dbm_init(ap_socache_instance_t *ctx, 
-                                     const char *namespace, 
+static apr_status_t socache_dbm_init(ap_socache_instance_t *ctx,
+                                     const char *namespace,
                                      const struct ap_socache_hints *hints,
                                      server_rec *s, apr_pool_t *p)
 {
@@ -130,7 +130,7 @@ static apr_status_t socache_dbm_init(ap_
     }
     apr_dbm_close(dbm);
 
-    ctx->expiry_interval = (hints && hints->expiry_interval 
+    ctx->expiry_interval = (hints && hints->expiry_interval
                             ? hints->expiry_interval : apr_time_from_sec(30));
 
 #if AP_NEED_SET_MUTEX_PERMS
@@ -176,10 +176,10 @@ static void socache_dbm_destroy(ap_socac
     return;
 }
 
-static apr_status_t socache_dbm_store(ap_socache_instance_t *ctx, 
-                                      server_rec *s, const unsigned char *id, 
-                                      unsigned int idlen, apr_time_t expiry, 
-                                      unsigned char *ucaData, 
+static apr_status_t socache_dbm_store(ap_socache_instance_t *ctx,
+                                      server_rec *s, const unsigned char *id,
+                                      unsigned int idlen, apr_time_t expiry,
+                                      unsigned char *ucaData,
                                       unsigned int nData, apr_pool_t *pool)
 {
     apr_dbm_t *dbm;
@@ -245,7 +245,7 @@ static apr_status_t socache_dbm_store(ap
     return APR_SUCCESS;
 }
 
-static apr_status_t socache_dbm_retrieve(ap_socache_instance_t *ctx, server_rec *s, 
+static apr_status_t socache_dbm_retrieve(ap_socache_instance_t *ctx, server_rec *s,
                                          const unsigned char *id, unsigned int idlen,
                                          unsigned char *dest, unsigned int *destlen,
                                          apr_pool_t *p)
@@ -270,7 +270,7 @@ static apr_status_t socache_dbm_retrieve
      * do the apr_dbm_close? This would make the code a bit cleaner.
      */
     apr_pool_clear(ctx->pool);
-    if ((rc = apr_dbm_open(&dbm, ctx->data_file, APR_DBM_RWCREATE, 
+    if ((rc = apr_dbm_open(&dbm, ctx->data_file, APR_DBM_RWCREATE,
                            DBM_FILE_MODE, ctx->pool)) != APR_SUCCESS) {
         ap_log_error(APLOG_MARK, APLOG_ERR, rc, s,
                      "Cannot open socache DBM file `%s' for reading "
@@ -293,7 +293,7 @@ static apr_status_t socache_dbm_retrieve
     if (nData > *destlen) {
         apr_dbm_close(dbm);
         return APR_ENOSPC;
-    }    
+    }
 
     *destlen = nData;
     memcpy(&expiry, dbmval.dptr, sizeof(apr_time_t));
@@ -311,7 +311,7 @@ static apr_status_t socache_dbm_retrieve
     return APR_SUCCESS;
 }
 
-static apr_status_t socache_dbm_remove(ap_socache_instance_t *ctx, 
+static apr_status_t socache_dbm_remove(ap_socache_instance_t *ctx,
                                        server_rec *s, const unsigned char *id,
                                        unsigned int idlen, apr_pool_t *p)
 {
@@ -326,7 +326,7 @@ static apr_status_t socache_dbm_remove(a
     /* and delete it from the DBM file */
     apr_pool_clear(ctx->pool);
 
-    if ((rv = apr_dbm_open(&dbm, ctx->data_file, APR_DBM_RWCREATE, 
+    if ((rv = apr_dbm_open(&dbm, ctx->data_file, APR_DBM_RWCREATE,
                            DBM_FILE_MODE, ctx->pool)) != APR_SUCCESS) {
         ap_log_error(APLOG_MARK, APLOG_ERR, rv, s,
                      "Cannot open socache DBM file `%s' for writing "
@@ -447,7 +447,7 @@ static void socache_dbm_expire(ap_socach
                  elts, elts-deleted, deleted);
 }
 
-static void socache_dbm_status(ap_socache_instance_t *ctx, request_rec *r, 
+static void socache_dbm_status(ap_socache_instance_t *ctx, request_rec *r,
                                int flags)
 {
     apr_dbm_t *dbm;
@@ -462,7 +462,7 @@ static void socache_dbm_status(ap_socach
     size = 0;
 
     apr_pool_clear(ctx->pool);
-    if ((rv = apr_dbm_open(&dbm, ctx->data_file, APR_DBM_RWCREATE, 
+    if ((rv = apr_dbm_open(&dbm, ctx->data_file, APR_DBM_RWCREATE,
                            DBM_FILE_MODE, ctx->pool)) != APR_SUCCESS) {
         ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
                      "Cannot open socache DBM file `%s' for status "
@@ -565,7 +565,7 @@ static const ap_socache_provider_t socac
 
 static void register_hooks(apr_pool_t *p)
 {
-    ap_register_provider(p, AP_SOCACHE_PROVIDER_GROUP, "dbm", 
+    ap_register_provider(p, AP_SOCACHE_PROVIDER_GROUP, "dbm",
                          AP_SOCACHE_PROVIDER_VERSION,
                          &socache_dbm);
 }

Modified: httpd/httpd/trunk/modules/cache/mod_socache_dc.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_socache_dc.c?rev=1174751&r1=1174750&r2=1174751&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_socache_dc.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_socache_dc.c Fri Sep 23 13:39:32 2011
@@ -38,22 +38,22 @@ struct ap_socache_instance_t {
     DC_CTX *dc;
 };
 
-static const char *socache_dc_create(ap_socache_instance_t **context, 
-                                     const char *arg, 
+static const char *socache_dc_create(ap_socache_instance_t **context,
+                                     const char *arg,
                                      apr_pool_t *tmp, apr_pool_t *p)
 {
     struct ap_socache_instance_t *ctx;
 
     ctx = *context = apr_palloc(p, sizeof *ctx);
-    
+
     ctx->target = apr_pstrdup(p, arg);
 
     return NULL;
 }
 
-static apr_status_t socache_dc_init(ap_socache_instance_t *ctx, 
-                                    const char *namespace, 
-                                    const struct ap_socache_hints *hints, 
+static apr_status_t socache_dc_init(ap_socache_instance_t *ctx,
+                                    const char *namespace,
+                                    const struct ap_socache_hints *hints,
                                     server_rec *s, apr_pool_t *p)
 {
 #if 0
@@ -90,13 +90,13 @@ static void socache_dc_destroy(ap_socach
     }
 }
 
-static apr_status_t socache_dc_store(ap_socache_instance_t *ctx, server_rec *s, 
+static apr_status_t socache_dc_store(ap_socache_instance_t *ctx, server_rec *s,
                                      const unsigned char *id, unsigned int idlen,
                                      apr_time_t expiry,
                                      unsigned char *der, unsigned int der_len,
                                      apr_pool_t *p)
 {
-    /* !@#$%^ - why do we deal with *absolute* time anyway??? 
+    /* !@#$%^ - why do we deal with *absolute* time anyway???
      * Uhm - because most things expire things at a specific time?
      * Were the API were thought out expiry - r->request_time is a good approximation
      */
@@ -111,7 +111,7 @@ static apr_status_t socache_dc_store(ap_
     return APR_SUCCESS;
 }
 
-static apr_status_t socache_dc_retrieve(ap_socache_instance_t *ctx, server_rec *s, 
+static apr_status_t socache_dc_retrieve(ap_socache_instance_t *ctx, server_rec *s,
                                         const unsigned char *id, unsigned int idlen,
                                         unsigned char *dest, unsigned int *destlen,
                                         apr_pool_t *p)
@@ -132,8 +132,8 @@ static apr_status_t socache_dc_retrieve(
     return APR_SUCCESS;
 }
 
-static apr_status_t socache_dc_remove(ap_socache_instance_t *ctx, 
-                                      server_rec *s, const unsigned char *id, 
+static apr_status_t socache_dc_remove(ap_socache_instance_t *ctx,
+                                      server_rec *s, const unsigned char *id,
                                       unsigned int idlen, apr_pool_t *p)
 {
     /* Remove any corresponding session from the distributed cache context */
@@ -177,7 +177,7 @@ static const ap_socache_provider_t socac
 
 static void register_hooks(apr_pool_t *p)
 {
-    ap_register_provider(p, AP_SOCACHE_PROVIDER_GROUP, "dc", 
+    ap_register_provider(p, AP_SOCACHE_PROVIDER_GROUP, "dc",
                          AP_SOCACHE_PROVIDER_VERSION,
                          &socache_dc);
 }

Modified: httpd/httpd/trunk/modules/cache/mod_socache_memcache.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_socache_memcache.c?rev=1174751&r1=1174750&r2=1174751&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_socache_memcache.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_socache_memcache.c Fri Sep 23 13:39:32 2011
@@ -61,24 +61,24 @@ struct ap_socache_instance_t {
     apr_size_t taglen; /* strlen(tag) + 1 */
 };
 
-static const char *socache_mc_create(ap_socache_instance_t **context, 
-                                     const char *arg, 
+static const char *socache_mc_create(ap_socache_instance_t **context,
+                                     const char *arg,
                                      apr_pool_t *tmp, apr_pool_t *p)
 {
     ap_socache_instance_t *ctx;
-    
+
     *context = ctx = apr_palloc(p, sizeof *ctx);
 
     if (!arg || !*arg) {
         return "List of server names required to create memcache socache.";
     }
-    
+
     ctx->servers = apr_pstrdup(p, arg);
 
     return NULL;
 }
 
-static apr_status_t socache_mc_init(ap_socache_instance_t *ctx, 
+static apr_status_t socache_mc_init(ap_socache_instance_t *ctx,
                                     const char *namespace,
                                     const struct ap_socache_hints *hints,
                                     server_rec *s, apr_pool_t *p)
@@ -103,7 +103,7 @@ static apr_status_t socache_mc_init(ap_s
     rv = apr_memcache_create(p, nservers, 0, &ctx->mc);
     if (rv != APR_SUCCESS) {
         ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s,
-                     "socache: Failed to create Memcache Object of '%d' size.", 
+                     "socache: Failed to create Memcache Object of '%d' size.",
                      nservers);
         return rv;
     }
@@ -144,7 +144,7 @@ static apr_status_t socache_mc_init(ap_s
                                         &st);
         if (rv != APR_SUCCESS) {
             ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s,
-                         "socache: Failed to Create memcache Server: %s:%d", 
+                         "socache: Failed to Create memcache Server: %s:%d",
                          host_str, port);
             return rv;
         }
@@ -152,7 +152,7 @@ static apr_status_t socache_mc_init(ap_s
         rv = apr_memcache_add_server(ctx->mc, st);
         if (rv != APR_SUCCESS) {
             ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s,
-                         "socache: Failed to Add memcache Server: %s:%d", 
+                         "socache: Failed to Add memcache Server: %s:%d",
                          host_str, port);
             return rv;
         }
@@ -198,7 +198,7 @@ static int socache_mc_id2key(ap_socache_
     return 0;
 }
 
-static apr_status_t socache_mc_store(ap_socache_instance_t *ctx, server_rec *s, 
+static apr_status_t socache_mc_store(ap_socache_instance_t *ctx, server_rec *s,
                                      const unsigned char *id, unsigned int idlen,
                                      apr_time_t expiry,
                                      unsigned char *ucaData, unsigned int nData,
@@ -224,7 +224,7 @@ static apr_status_t socache_mc_store(ap_
     return APR_SUCCESS;
 }
 
-static apr_status_t socache_mc_retrieve(ap_socache_instance_t *ctx, server_rec *s, 
+static apr_status_t socache_mc_retrieve(ap_socache_instance_t *ctx, server_rec *s,
                                         const unsigned char *id, unsigned int idlen,
                                         unsigned char *dest, unsigned int *destlen,
                                         apr_pool_t *p)
@@ -252,7 +252,7 @@ static apr_status_t socache_mc_retrieve(
         ap_log_error(APLOG_MARK, APLOG_ERR, rv, s,
                      "scache_mc: 'retrieve' OVERFLOW");
         return APR_ENOMEM;
-    }    
+    }
 
     memcpy(dest, data, data_len);
     *destlen = data_len;
@@ -260,8 +260,8 @@ static apr_status_t socache_mc_retrieve(
     return APR_SUCCESS;
 }
 
-static apr_status_t socache_mc_remove(ap_socache_instance_t *ctx, server_rec *s, 
-                                      const unsigned char *id, 
+static apr_status_t socache_mc_remove(ap_socache_instance_t *ctx, server_rec *s,
+                                      const unsigned char *id,
                                       unsigned int idlen, apr_pool_t *p)
 {
     char buf[MC_KEY_LEN];
@@ -313,7 +313,7 @@ static const ap_socache_provider_t socac
 static void register_hooks(apr_pool_t *p)
 {
 #ifdef HAVE_APU_MEMCACHE
-    ap_register_provider(p, AP_SOCACHE_PROVIDER_GROUP, "mc", 
+    ap_register_provider(p, AP_SOCACHE_PROVIDER_GROUP, "mc",
                          AP_SOCACHE_PROVIDER_VERSION,
                          &socache_mc);
 #endif

Modified: httpd/httpd/trunk/modules/cache/mod_socache_shmcb.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_socache_shmcb.c?rev=1174751&r1=1174750&r2=1174751&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_socache_shmcb.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_socache_shmcb.c Fri Sep 23 13:39:32 2011
@@ -61,7 +61,7 @@ typedef struct {
     unsigned int subcache_data_size;
 } SHMCBHeader;
 
-/* 
+/*
  * Subcache structure - the start of each subcache, followed by
  * indexes then data
  */
@@ -72,7 +72,7 @@ typedef struct {
     unsigned int data_pos, data_used;
 } SHMCBSubcache;
 
-/* 
+/*
  * Index structure - each subcache has an array of these
  */
 typedef struct {
@@ -124,7 +124,7 @@ struct ap_socache_instance_t {
  *
  * Each in-use SHMCBIndex structure represents a single cached object.
  * The ID and data segment are stored consecutively in the subcache's
- * cyclic data buffer.  The "Data" segment can thus be seen to 
+ * cyclic data buffer.  The "Data" segment can thus be seen to
  * look like this, for example
  *
  * offset:  [ 0     1     2     3     4     5     6    ...
@@ -213,7 +213,7 @@ static void shmcb_cyclic_ntoc_memcpy(uns
  * SRC_LEN against the contents of cyclic buffer DATA (which is of
  * size BUF_SIZE), starting at offset DEST_OFFSET. Got that?  Good. */
 static int shmcb_cyclic_memcmp(unsigned int buf_size, unsigned char *data,
-                               unsigned int dest_offset, 
+                               unsigned int dest_offset,
                                const unsigned char *src,
                                unsigned int src_len)
 {
@@ -223,7 +223,7 @@ static int shmcb_cyclic_memcmp(unsigned 
     else {
         /* Compare the two splits */
         int diff;
-        
+
         diff = memcmp(data + dest_offset, src, buf_size - dest_offset);
         if (diff) {
             return diff;
@@ -237,17 +237,17 @@ static int shmcb_cyclic_memcmp(unsigned 
 /* Prototypes for low-level subcache operations */
 static void shmcb_subcache_expire(server_rec *, SHMCBHeader *, SHMCBSubcache *,
                                   apr_time_t);
-/* Returns zero on success, non-zero on failure. */   
+/* Returns zero on success, non-zero on failure. */
 static int shmcb_subcache_store(server_rec *s, SHMCBHeader *header,
-                                SHMCBSubcache *subcache, 
+                                SHMCBSubcache *subcache,
                                 unsigned char *data, unsigned int data_len,
                                 const unsigned char *id, unsigned int id_len,
                                 apr_time_t expiry);
-/* Returns zero on success, non-zero on failure. */   
+/* Returns zero on success, non-zero on failure. */
 static int shmcb_subcache_retrieve(server_rec *, SHMCBHeader *, SHMCBSubcache *,
                                    const unsigned char *id, unsigned int idlen,
                                    unsigned char *data, unsigned int *datalen);
-/* Returns zero on success, non-zero on failure. */   
+/* Returns zero on success, non-zero on failure. */
 static int shmcb_subcache_remove(server_rec *, SHMCBHeader *, SHMCBSubcache *,
                                  const unsigned char *, unsigned int);
 
@@ -269,7 +269,7 @@ static apr_status_t shmcb_subcache_itera
  */
 
 static const char *socache_shmcb_create(ap_socache_instance_t **context,
-                                        const char *arg, 
+                                        const char *arg,
                                         apr_pool_t *tmp, apr_pool_t *p)
 {
     ap_socache_instance_t *ctx;
@@ -277,14 +277,14 @@ static const char *socache_shmcb_create(
 
     /* Allocate the context. */
     *context = ctx = apr_pcalloc(p, sizeof *ctx);
-    
+
     ctx->shm_size  = 1024*512; /* 512KB */
 
     if (!arg || *arg == '\0') {
         /* Use defaults. */
         return NULL;
     }
-    
+
     ctx->data_file = path = ap_server_root_relative(p, arg);
 
     cp = strrchr(path, '(');
@@ -297,24 +297,24 @@ static const char *socache_shmcb_create(
         }
         *cp++ = '\0';
         *cp2  = '\0';
-        
-        
+
+
         ctx->shm_size = strtol(cp, &endptr, 10);
         if (endptr != cp2) {
             return "Invalid argument: cache size not numerical";
         }
-        
+
         if (ctx->shm_size < 8192) {
             return "Invalid argument: size has to be >= 8192 bytes";
-            
+
         }
-        
+
         if (ctx->shm_size >= SHMCB_MAX_SIZE) {
             return apr_psprintf(tmp,
                                 "Invalid argument: size has "
-                                "to be < %d bytes on this platform", 
+                                "to be < %d bytes on this platform",
                                 SHMCB_MAX_SIZE);
-            
+
         }
     }
     else if (cp2 >= path && *cp2 == ')') {
@@ -325,7 +325,7 @@ static const char *socache_shmcb_create(
 }
 
 static apr_status_t socache_shmcb_init(ap_socache_instance_t *ctx,
-                                       const char *namespace, 
+                                       const char *namespace,
                                        const struct ap_socache_hints *hints,
                                        server_rec *s, apr_pool_t *p)
 {
@@ -338,7 +338,7 @@ static apr_status_t socache_shmcb_init(a
 
     /* Create shared memory segment */
     if (ctx->data_file == NULL) {
-        const char *path = apr_pstrcat(p, DEFAULT_SHMCB_PREFIX, namespace, 
+        const char *path = apr_pstrcat(p, DEFAULT_SHMCB_PREFIX, namespace,
                                        DEFAULT_SHMCB_SUFFIX, NULL);
 
         ctx->data_file = ap_server_root_relative(p, path);
@@ -394,7 +394,7 @@ static apr_status_t socache_shmcb_init(a
         num_subcache /= 2;
     num_idx /= num_subcache;
     ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
-                 "for %" APR_SIZE_T_FMT " bytes (%" APR_SIZE_T_FMT 
+                 "for %" APR_SIZE_T_FMT " bytes (%" APR_SIZE_T_FMT
                  " including header), recommending %u subcaches, "
                  "%u indexes each", shm_segsize,
                  shm_segsize + sizeof(SHMCBHeader), num_subcache, num_idx);
@@ -461,9 +461,9 @@ static void socache_shmcb_destroy(ap_soc
     }
 }
 
-static apr_status_t socache_shmcb_store(ap_socache_instance_t *ctx, 
-                                        server_rec *s, const unsigned char *id, 
-                                        unsigned int idlen, apr_time_t expiry, 
+static apr_status_t socache_shmcb_store(ap_socache_instance_t *ctx,
+                                        server_rec *s, const unsigned char *id,
+                                        unsigned int idlen, apr_time_t expiry,
                                         unsigned char *encoded,
                                         unsigned int len_encoded,
                                         apr_pool_t *p)
@@ -499,8 +499,8 @@ static apr_status_t socache_shmcb_store(
     return APR_SUCCESS;
 }
 
-static apr_status_t socache_shmcb_retrieve(ap_socache_instance_t *ctx, 
-                                           server_rec *s, 
+static apr_status_t socache_shmcb_retrieve(ap_socache_instance_t *ctx,
+                                           server_rec *s,
                                            const unsigned char *id, unsigned int idlen,
                                            unsigned char *dest, unsigned int *destlen,
                                            apr_pool_t *p)
@@ -526,7 +526,7 @@ static apr_status_t socache_shmcb_retrie
     return rv == 0 ? APR_SUCCESS : APR_NOTFOUND;
 }
 
-static apr_status_t socache_shmcb_remove(ap_socache_instance_t *ctx, 
+static apr_status_t socache_shmcb_remove(ap_socache_instance_t *ctx,
                                          server_rec *s, const unsigned char *id,
                                          unsigned int idlen, apr_pool_t *p)
 {
@@ -555,7 +555,7 @@ static apr_status_t socache_shmcb_remove
     return rv;
 }
 
-static void socache_shmcb_status(ap_socache_instance_t *ctx, 
+static void socache_shmcb_status(ap_socache_instance_t *ctx,
                                  request_rec *r, int flags)
 {
     server_rec *s = r->server;
@@ -654,7 +654,7 @@ static apr_status_t socache_shmcb_iterat
 }
 
 /*
- * Subcache-level cache operations 
+ * Subcache-level cache operations
  */
 
 static void shmcb_subcache_expire(server_rec *s, SHMCBHeader *header,
@@ -704,7 +704,7 @@ static void shmcb_subcache_expire(server
 }
 
 static int shmcb_subcache_store(server_rec *s, SHMCBHeader *header,
-                                SHMCBSubcache *subcache, 
+                                SHMCBSubcache *subcache,
                                 unsigned char *data, unsigned int data_len,
                                 const unsigned char *id, unsigned int id_len,
                                 apr_time_t expiry)
@@ -797,7 +797,7 @@ static int shmcb_subcache_store(server_r
     idx->removed = 0;
     subcache->idx_used++;
     ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
-                 "insert happened at idx=%d, data=(%u:%u)", new_idx, 
+                 "insert happened at idx=%d, data=(%u:%u)", new_idx,
                  id_offset, data_offset);
     ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
                  "finished insert, subcache: idx_pos/idx_used=%d/%d, "
@@ -808,7 +808,7 @@ static int shmcb_subcache_store(server_r
 }
 
 static int shmcb_subcache_retrieve(server_rec *s, SHMCBHeader *header,
-                                   SHMCBSubcache *subcache, 
+                                   SHMCBSubcache *subcache,
                                    const unsigned char *id, unsigned int idlen,
                                    unsigned char *dest, unsigned int *destlen)
 {
@@ -823,7 +823,7 @@ static int shmcb_subcache_retrieve(serve
 
         /* Only consider 'idx' if the id matches, and the "removed"
          * flag isn't set, and the record is not expired.
-         * Check the data length too to avoid a buffer overflow 
+         * Check the data length too to avoid a buffer overflow
          * in case of corruption, which should be impossible,
          * but it's cheap to be safe. */
         if (!idx->removed
@@ -838,7 +838,7 @@ static int shmcb_subcache_retrieve(serve
                 unsigned int data_offset;
 
                 /* Find the offset of the data segment, after the id */
-                data_offset = SHMCB_CYCLIC_INCREMENT(idx->data_pos, 
+                data_offset = SHMCB_CYCLIC_INCREMENT(idx->data_pos,
                                                      idx->id_len,
                                                      header->subcache_data_size);
 
@@ -936,13 +936,13 @@ static apr_status_t shmcb_subcache_itera
                 apr_size_t buf_req;
 
                 /* Find the offset of the data segment, after the id */
-                data_offset = SHMCB_CYCLIC_INCREMENT(idx->data_pos, 
+                data_offset = SHMCB_CYCLIC_INCREMENT(idx->data_pos,
                                                      idx->id_len,
                                                      header->subcache_data_size);
 
                 dest_len = idx->data_used - idx->id_len;
 
-                buf_req = APR_ALIGN_DEFAULT(idx->id_len + 1) 
+                buf_req = APR_ALIGN_DEFAULT(idx->id_len + 1)
                         + APR_ALIGN_DEFAULT(dest_len + 1);
 
                 if (buf_req > *buf_len) {
@@ -1004,12 +1004,12 @@ static const ap_socache_provider_t socac
 
 static void register_hooks(apr_pool_t *p)
 {
-    ap_register_provider(p, AP_SOCACHE_PROVIDER_GROUP, "shmcb", 
+    ap_register_provider(p, AP_SOCACHE_PROVIDER_GROUP, "shmcb",
                          AP_SOCACHE_PROVIDER_VERSION,
                          &socache_shmcb);
 
     /* Also register shmcb under the default provider name. */
-    ap_register_provider(p, AP_SOCACHE_PROVIDER_GROUP, 
+    ap_register_provider(p, AP_SOCACHE_PROVIDER_GROUP,
                          AP_SOCACHE_DEFAULT_PROVIDER,
                          AP_SOCACHE_PROVIDER_VERSION,
                          &socache_shmcb);

Modified: httpd/httpd/trunk/modules/cluster/mod_heartmonitor.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cluster/mod_heartmonitor.c?rev=1174751&r1=1174750&r2=1174751&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cluster/mod_heartmonitor.c (original)
+++ httpd/httpd/trunk/modules/cluster/mod_heartmonitor.c Fri Sep 23 13:39:32 2011
@@ -275,10 +275,10 @@ static apr_status_t hm_file_update_stat(
             apr_brigade_cleanup(tmpbb);
             if (APR_BRIGADE_EMPTY(bb)) {
                 break;
-            } 
+            }
             rv = apr_brigade_split_line(tmpbb, bb,
                                         APR_BLOCK_READ, sizeof(buf));
-       
+
             if (rv) {
                 ap_log_error(APLOG_MARK, APLOG_CRIT, rv, ctx->s,
                              "Heartmonitor: Unable to read from file: %s", ctx->storage_path);
@@ -300,7 +300,7 @@ static apr_status_t hm_file_update_stat(
                 /* copy things we can't process */
                 apr_file_printf(fp, "%s\n", buf);
             } else if (strcmp(ip, s->ip) !=0 ) {
-                hm_server_t node; 
+                hm_server_t node;
                 apr_time_t seen;
                 /* Update seen time according to the last file modification */
                 apr_table_clear(hbt);
@@ -320,14 +320,14 @@ static apr_status_t hm_file_update_stat(
                 if (apr_table_get(hbt, "lastseen")) {
                     node.seen = atoi(apr_table_get(hbt, "lastseen"));
                 } else {
-                    node.seen = SEEN_TIMEOUT; 
+                    node.seen = SEEN_TIMEOUT;
                 }
                 seen = fage + node.seen;
 
                 if (apr_table_get(hbt, "port")) {
                     node.port = atoi(apr_table_get(hbt, "port"));
                 } else {
-                    node.port = 80; 
+                    node.port = 80;
                 }
                 apr_file_printf(fp, "%s &ready=%u&busy=%u&lastseen=%u&port=%u\n",
                                 ip, node.ready, node.busy, (unsigned int) seen, node.port);
@@ -361,7 +361,7 @@ static apr_status_t hm_file_update_stat(
                    "Heartmonitor: Unable to close file: %s", path);
       return rv;
     }
-  
+
     rv = apr_file_perms_set(path,
                             APR_FPROT_UREAD | APR_FPROT_GREAD |
                             APR_FPROT_WREAD);
@@ -440,7 +440,7 @@ static apr_status_t hm_file_update_stats
                    "Heartmonitor: Unable to close file: %s", path);
       return rv;
     }
-  
+
     rv = apr_file_perms_set(path,
                             APR_FPROT_UREAD | APR_FPROT_GREAD |
                             APR_FPROT_WREAD);
@@ -542,7 +542,7 @@ static void hm_processmsg(hm_ctx_t *ctx,
 
         if (apr_table_get(tbl, "port") != NULL)
             port = atoi(apr_table_get(tbl, "port"));
-           
+
         s = hm_get_server(ctx, ip, port);
 
         s->busy = atoi(apr_table_get(tbl, "busy"));
@@ -879,7 +879,7 @@ static const char *cmd_hm_maxworkers(cmd
 
     maxworkers = atoi(data);
     if (maxworkers <= 10)
-        return "HeartbeatMaxServers: Should be bigger than 10"; 
+        return "HeartbeatMaxServers: Should be bigger than 10";
 
     return NULL;
 }

Modified: httpd/httpd/trunk/modules/core/mod_so.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/mod_so.c?rev=1174751&r1=1174750&r2=1174751&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/core/mod_so.c (original)
+++ httpd/httpd/trunk/modules/core/mod_so.c Fri Sep 23 13:39:32 2011
@@ -271,7 +271,7 @@ static const char *load_module(cmd_parms
                             "is garbled - expected signature %08lx but saw "
                             "%08lx - perhaps this is not an Apache module DSO, "
                             "or was compiled for a different Apache version?",
-                            modname, szModuleFile, 
+                            modname, szModuleFile,
                             MODULE_MAGIC_COOKIE, modp->magic);
     }
 

Modified: httpd/httpd/trunk/modules/dav/fs/repos.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/dav/fs/repos.c?rev=1174751&r1=1174750&r2=1174751&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/dav/fs/repos.c (original)
+++ httpd/httpd/trunk/modules/dav/fs/repos.c Fri Sep 23 13:39:32 2011
@@ -143,7 +143,7 @@ enum {
 /*
  * prefix for temporary files
  */
-#define DAV_FS_TMP_PREFIX ".davfs.tmp" 
+#define DAV_FS_TMP_PREFIX ".davfs.tmp"
 
 static const dav_liveprop_spec dav_fs_props[] =
 {
@@ -360,7 +360,7 @@ static dav_error * dav_fs_copymove_file(
 
     dav_set_bufsize(p, pbuf, DAV_FS_COPY_BLOCKSIZE);
 
-    if ((status = apr_file_open(&inf, src, APR_READ | APR_BINARY, 
+    if ((status = apr_file_open(&inf, src, APR_READ | APR_BINARY,
                                 APR_OS_DEFAULT, p)) != APR_SUCCESS) {
         /* ### use something besides 500? */
         return dav_new_error(p, HTTP_INTERNAL_SERVER_ERROR, 0, status,
@@ -391,7 +391,7 @@ static dav_error * dav_fs_copymove_file(
                 /* ### ACK! Inconsistent state... */
 
                 /* ### use something besides 500? */
-                return dav_new_error(p, HTTP_INTERNAL_SERVER_ERROR, 0, 
+                return dav_new_error(p, HTTP_INTERNAL_SERVER_ERROR, 0,
                                      lcl_status,
                                      "Could not delete output after read "
                                      "failure. Server is now in an "
@@ -448,7 +448,7 @@ static dav_error * dav_fs_copymove_file(
                                               "server may be in an "
                                               "inconsistent state.", src, dst));
             return err;
-        } 
+        }
         else if ((lcl_status = apr_file_remove(dst, p)) != APR_SUCCESS) {
             /* ### ACK. this creates an inconsistency. do more!? */
 
@@ -899,7 +899,7 @@ static apr_status_t dav_fs_mktemp(apr_fi
                            APR_WRITE | APR_CREATE | APR_BINARY | APR_EXCL,
                            APR_OS_DEFAULT, p);
     } while (APR_STATUS_IS_EEXIST(rv));
-        
+
     return rv;
 }
 

Modified: httpd/httpd/trunk/modules/dav/main/mod_dav.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/dav/main/mod_dav.c?rev=1174751&r1=1174750&r2=1174751&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/dav/main/mod_dav.c (original)
+++ httpd/httpd/trunk/modules/dav/main/mod_dav.c Fri Sep 23 13:39:32 2011
@@ -1622,18 +1622,18 @@ static int dav_method_options(request_re
     /* DAV header additions registered by external modules */
     extensions = ap_list_provider_names(r->pool, DAV_OPTIONS_EXTENSION_GROUP, "0");
     entry = (ap_list_provider_names_t *)extensions->elts;
-	
+
     for (i = 0; i < extensions->nelts; i++, entry++) {
-	const dav_options_provider *options = 
+	const dav_options_provider *options =
 	    dav_get_options_providers(entry->provider_name);
-	
+
 	if (options && options->dav_header) {
 	    apr_text_header hoptions = { 0 };
-	    
+
 	    options->dav_header(r, resource, &hoptions);
 	    for (t = hoptions.first; t && t->text; t = t->next)
 		dav_level = apr_pstrcat(r->pool, dav_level, ",", t->text, NULL);
-	}   
+	}
     }
 
     /* ###
@@ -1782,18 +1782,18 @@ static int dav_method_options(request_re
     /* additional methods registered by external modules */
     extensions = ap_list_provider_names(r->pool, DAV_OPTIONS_EXTENSION_GROUP, "0");
     entry = (ap_list_provider_names_t *)extensions->elts;
-    
+
     for (i = 0; i < extensions->nelts; i++, entry++) {
-	const dav_options_provider *options = 
+	const dav_options_provider *options =
 	    dav_get_options_providers(entry->provider_name);
-	
+
 	if (options && options->dav_method) {
 	    apr_text_header hoptions = { 0 };
-	    
+
 	    options->dav_method(r, resource, &hoptions);
 	    for (t = hoptions.first; t && t->text; t = t->next)
 		apr_table_addn(methods, t->text, "");
-	}    
+	}
     }
 
     /* Generate the Allow header */
@@ -3045,7 +3045,7 @@ static int dav_method_lock(request_rec *
         err = dav_new_error(r->pool, HTTP_CONFLICT, 0, 0,
                            apr_psprintf(r->pool,
                                         "The parent resource of %s does not "
-                                        "exist or is not a collection.", 
+                                        "exist or is not a collection.",
                                         ap_escape_html(r->pool, r->uri)));
         return dav_handle_err(r, err, NULL);
     }

Modified: httpd/httpd/trunk/modules/dav/main/util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/dav/main/util.c?rev=1174751&r1=1174750&r2=1174751&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/dav/main/util.c (original)
+++ httpd/httpd/trunk/modules/dav/main/util.c Fri Sep 23 13:39:32 2011
@@ -1421,11 +1421,11 @@ static int dav_meets_conditions(request_
 
     retVal = ap_meets_conditions(r);
 
-    /* If-None-Match '*' fix. If-None-Match '*' request should succeed 
+    /* If-None-Match '*' fix. If-None-Match '*' request should succeed
      * if the resource does not exist. */
     if (retVal == HTTP_PRECONDITION_FAILED) {
         /* Note. If if_none_match != NULL, if_none_match is the culprit.
-         * Since, in presence of If-None-Match, 
+         * Since, in presence of If-None-Match,
          * other If-* headers are undefined. */
         if ((if_none_match =
             apr_table_get(r->headers_in, "If-None-Match")) != NULL) {

Modified: httpd/httpd/trunk/modules/echo/mod_echo.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/echo/mod_echo.c?rev=1174751&r1=1174750&r2=1174751&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/echo/mod_echo.c (original)
+++ httpd/httpd/trunk/modules/echo/mod_echo.c Fri Sep 23 13:39:32 2011
@@ -92,7 +92,7 @@ static apr_status_t brigade_peek(apr_buc
 }
 
 
-static int update_echo_child_status(ap_sb_handle_t *sbh, 
+static int update_echo_child_status(ap_sb_handle_t *sbh,
                                     int status, conn_rec *c,
                                     apr_bucket_brigade *last_echoed)
 {
@@ -108,7 +108,7 @@ static int update_echo_child_status(ap_s
 
     /* initial pass only, please - in the name of efficiency */
     if (c) {
-        apr_cpystrn(ws->client, 
+        apr_cpystrn(ws->client,
                     ap_get_remote_host(c, c->base_server->lookup_defaults,
                                        REMOTE_NOLOOKUP, NULL),
                     sizeof(ws->client));
@@ -120,7 +120,7 @@ static int update_echo_child_status(ap_s
 
     /* each subsequent WRITE pass, let's update what we echoed */
     if (last_echoed) {
-        brigade_peek(last_echoed, ws->request + sizeof("ECHO ") - 1, 
+        brigade_peek(last_echoed, ws->request + sizeof("ECHO ") - 1,
                      sizeof(ws->request) - sizeof("ECHO ") + 1);
     }
 
@@ -138,7 +138,7 @@ static int process_echo_connection(conn_
     if (!pConfig->bEnabled) {
         return DECLINED;
     }
-    
+
     ap_time_process_request(c->sbh, START_PREQUEST);
     update_echo_child_status(c->sbh, SERVER_BUSY_READ, c, NULL);
 
@@ -182,7 +182,7 @@ static int process_echo_connection(conn_
             ap_log_error(APLOG_MARK, APLOG_INFO, rv, c->base_server,
                          "ProtocolEcho: Failure writing to %s",
                          c->remote_ip);
-            break; 
+            break;
         }
         apr_brigade_cleanup(bb);
 

Modified: httpd/httpd/trunk/modules/examples/mod_case_filter.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/examples/mod_case_filter.c?rev=1174751&r1=1174750&r2=1174751&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/examples/mod_case_filter.c (original)
+++ httpd/httpd/trunk/modules/examples/mod_case_filter.c Fri Sep 23 13:39:32 2011
@@ -91,7 +91,7 @@ static apr_status_t CaseFilterOutFilter(
         APR_BRIGADE_INSERT_TAIL(pbbOut,pbktOut);
         }
 
-    /* Q: is there any advantage to passing a brigade for each bucket? 
+    /* Q: is there any advantage to passing a brigade for each bucket?
      * A: obviously, it can cut down server resource consumption, if this
      * experimental module was fed a file of 4MB, it would be using 8MB for
      * the 'read' buckets and the 'write' buckets.

Modified: httpd/httpd/trunk/modules/examples/mod_example_hooks.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/examples/mod_example_hooks.c?rev=1174751&r1=1174750&r2=1174751&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/examples/mod_example_hooks.c (original)
+++ httpd/httpd/trunk/modules/examples/mod_example_hooks.c Fri Sep 23 13:39:32 2011
@@ -27,36 +27,36 @@
  *
  * To use mod_example_hooks, configure the Apache build with
  * --enable-example and compile.  Set up a <Location> block in your
- * configuration file like so: 
- * 
+ * configuration file like so:
+ *
  * <Location /example>
  *    SetHandler example-hooks-handler
- * </Location> 
- * 
- * When you look at that location on your server, you will see a backtrace of 
- * the callbacks that have been invoked up to that point.  See the ErrorLog for 
- * more information on code paths that  touch mod_example_hooks. 
+ * </Location>
+ *
+ * When you look at that location on your server, you will see a backtrace of
+ * the callbacks that have been invoked up to that point.  See the ErrorLog for
+ * more information on code paths that  touch mod_example_hooks.
  *
  * IMPORTANT NOTES
  * ===============
- * 
+ *
  * Do NOT use this module on a production server. It attaches itself to every
  * phase of the server runtime operations including startup, shutdown and
- * request processing, and produces copious amounts of logging data.  This will 
- * negatively affect server performance. 
- * 
+ * request processing, and produces copious amounts of logging data.  This will
+ * negatively affect server performance.
+ *
  * Do NOT use mod_example_hooks as the basis for your own code.  This module
  * implements every callback hook offered by the Apache core, and your
  * module will almost certainly not have to implement this much.  If you
- * want a simple module skeleton to start development, use apxs -g. 
- * 
+ * want a simple module skeleton to start development, use apxs -g.
+ *
  * XXX TO DO XXX
  * =============
  *
- * * Enable HTML backtrace entries for more callbacks that are not directly 
+ * * Enable HTML backtrace entries for more callbacks that are not directly
  *   associated with a request
  * * Make sure every callback that posts an HTML backtrace entry does so in the *   right category, so nothing gets overwritten
- * * Implement some logic to show what happens in the parent, and what in the 
+ * * Implement some logic to show what happens in the parent, and what in the
  *   child(ren)
  */
 
@@ -120,8 +120,8 @@ typedef struct x_cfg {
 } x_cfg;
 
 /*
- * String pointer to hold the startup trace. No harm working with a global until 
- * the server is (may be) multi-threaded. 
+ * String pointer to hold the startup trace. No harm working with a global until
+ * the server is (may be) multi-threaded.
  */
 static const char *trace = NULL;
 
@@ -283,10 +283,10 @@ static x_cfg *our_dconfig(const request_
     return (x_cfg *) ap_get_module_config(r->per_dir_config, &example_hooks_module);
 }
 
-/* 
- * The following utility routines are not used in the module. Don't 
- * compile them so -Wall doesn't complain about functions that are 
- * defined but not used. 
+/*
+ * The following utility routines are not used in the module. Don't
+ * compile them so -Wall doesn't complain about functions that are
+ * defined but not used.
  */
 #if 0
 /*
@@ -320,15 +320,15 @@ static x_cfg *our_cconfig(const conn_rec
  * these co-routines are called for every single request, and the impact
  * on the size (and readability) of the error_log is considerable.
  */
-#ifndef EXAMPLE_LOG_EACH 
+#ifndef EXAMPLE_LOG_EACH
 #define EXAMPLE_LOG_EACH 0
 #endif
 
-#if EXAMPLE_LOG_EACH 
+#if EXAMPLE_LOG_EACH
 static void example_log_each(apr_pool_t *p, server_rec *s, const char *note)
 {
     if (s != NULL) {
-        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "mod_example: %s", 
+        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "mod_example: %s",
                      note);
     } else {
         apr_file_t *out = NULL;
@@ -339,19 +339,19 @@ static void example_log_each(apr_pool_t 
 }
 #endif
 
-/* 
- * This utility routine traces the hooks called when the server starts up. 
- * It leaves a trace in a global variable, so it should not be called from 
- * a hook handler that runs in a multi-threaded situation. 
+/*
+ * This utility routine traces the hooks called when the server starts up.
+ * It leaves a trace in a global variable, so it should not be called from
+ * a hook handler that runs in a multi-threaded situation.
  */
 
-static void trace_startup(apr_pool_t *p, server_rec *s, x_cfg *mconfig, 
+static void trace_startup(apr_pool_t *p, server_rec *s, x_cfg *mconfig,
                           const char *note)
 {
     const char *sofar;
     char *where, *addon;
 
-#if EXAMPLE_LOG_EACH 
+#if EXAMPLE_LOG_EACH
     example_log_each(p, s, note);
 #endif
 
@@ -374,28 +374,28 @@ static void trace_startup(apr_pool_t *p,
                         "   </li>\n",
                         NULL);
 
-    /* 
-     * Make sure that we start with a valid string, even if we have never been 
-     * called.  
+    /*
+     * Make sure that we start with a valid string, even if we have never been
+     * called.
      */
     sofar = (trace == NULL) ? "" : trace;
-    
+
     trace = apr_pstrcat(p, sofar, addon, NULL);
 }
 
 
 /*
- * This utility route traces the hooks called as a request is handled. 
- * It takes the current request as argument 
+ * This utility route traces the hooks called as a request is handled.
+ * It takes the current request as argument
  */
 #define TRACE_NOTE "example-hooks-trace"
- 
+
 static void trace_request(const request_rec *r, const char *note)
 {
     const char *trace_copy, *sofar;
     char *addon, *where;
     x_cfg *cfg;
-    
+
 #if EXAMPLE_LOG_EACH
     example_log_each(r->pool, r->server, note);
 #endif
@@ -403,13 +403,13 @@ static void trace_request(const request_
     if ((sofar = apr_table_get(r->notes, TRACE_NOTE)) == NULL) {
         sofar = "";
     }
-    
+
     cfg = our_dconfig(r);
-    
+
     where = (cfg != NULL) ? cfg->loc : "nowhere";
     where = (where != NULL) ? where : "";
-    
-    addon = apr_pstrcat(r->pool, 
+
+    addon = apr_pstrcat(r->pool,
                         "   <li>\n"
                         "    <dl>\n"
                         "     <dt><samp>", note, "</samp></dt>\n"
@@ -423,12 +423,12 @@ static void trace_request(const request_
 }
 
 /*
- * This utility routine traces the hooks called while processing a 
- * Connection. Its trace is kept in the pool notes of the pool associated 
+ * This utility routine traces the hooks called while processing a
+ * Connection. Its trace is kept in the pool notes of the pool associated
  * with the Connection.
  */
 
-/* 
+/*
  * Key to get and set the userdata.  We should be able to get away
  * with a constant key, since in prefork mode the process will have
  * the connection and its pool to itself entirely, and in
@@ -436,7 +436,7 @@ static void trace_request(const request_
  */
 #define CONN_NOTE "example-hooks-connection"
 
-static void trace_connection(conn_rec *c, const char *note) 
+static void trace_connection(conn_rec *c, const char *note)
 {
     const char *trace_copy, *sofar;
     char *addon, *where;
@@ -451,8 +451,8 @@ static void trace_connection(conn_rec *c
 
     where = (cfg != NULL) ? cfg->loc : "nowhere";
     where = (where != NULL) ? where : "";
-    
-    addon = apr_pstrcat(c->pool, 
+
+    addon = apr_pstrcat(c->pool,
                         "   <li>\n"
                         "    <dl>\n"
                         "     <dt><samp>", note, "</samp></dt>\n"
@@ -468,7 +468,7 @@ static void trace_connection(conn_rec *c
     /* Tack addon onto copy */
     trace_copy = apr_pstrcat(c->pool, sofar, addon, NULL);
 
-    /* 
+    /*
      * Stash copy back into pool notes.  This call has a cleanup
      * parameter, but we're not using it because the string has been
      * allocated from that same pool.  There is also an unused return
@@ -476,14 +476,14 @@ static void trace_connection(conn_rec *c
      * occur, and will have to check for the existence of this data on
      * the other end.
      */
-    apr_pool_userdata_set((const void *) trace_copy, CONN_NOTE, 
+    apr_pool_userdata_set((const void *) trace_copy, CONN_NOTE,
                           NULL, c->pool);
 }
 
-static void trace_nocontext(apr_pool_t *p, const char *file, int line, 
+static void trace_nocontext(apr_pool_t *p, const char *file, int line,
                             const char *note)
 {
-    /* 
+    /*
      * Since we have no request or connection to trace, or any idea
      * from where this routine was called, there's really not much we
      * can do.  If we are not logging everything by way of the
@@ -565,7 +565,7 @@ static void *x_create_dir_config(apr_poo
      */
     dname = (dname != NULL) ? dname : "";
     cfg->loc = apr_pstrcat(p, "DIR(", dname, ")", NULL);
-    note = apr_psprintf(p, "x_create_dir_config(p == %pp, dirspec == %s)", 
+    note = apr_psprintf(p, "x_create_dir_config(p == %pp, dirspec == %s)",
                         (void*) p, dirspec);
     trace_startup(p, NULL, cfg, note);
     return (void *) cfg;
@@ -618,7 +618,7 @@ static void *x_merge_dir_config(apr_pool
      * Now just record our being called in the trace list.  Include the
      * locations we were asked to merge.
      */
-    note = apr_psprintf(p, "x_merge_dir_config(p == %pp, parent_conf == " 
+    note = apr_psprintf(p, "x_merge_dir_config(p == %pp, parent_conf == "
                         "%pp, newloc_conf == %pp)", (void*) p,
                         (void*) parent_conf, (void*) newloc_conf);
     trace_startup(p, NULL, merged_config, note);
@@ -773,7 +773,7 @@ static int x_check_config(apr_pool_t *pc
  * phase and just before the process exits.  At this point the module
  * may output any information useful in configuration testing.
  *
- * This is a VOID hook: all defined handlers get called. 
+ * This is a VOID hook: all defined handlers get called.
  */
 static void x_test_config(apr_pool_t *pconf, server_rec *s)
 {
@@ -782,7 +782,7 @@ static void x_test_config(apr_pool_t *pc
     apr_file_open_stderr(&out, pconf);
 
     apr_file_printf(out, "Example module configuration test routine\n");
-    
+
     trace_startup(pconf, s, NULL, "x_test_config()");
 }
 
@@ -846,7 +846,7 @@ static apr_status_t x_child_exit(void *d
 /*
  * All our process initialiser does is add its trace to the log.
  *
- * This is a VOID hook: all defined handlers get called. 
+ * This is a VOID hook: all defined handlers get called.
  */
 static void x_child_init(apr_pool_t *p, server_rec *s)
 {
@@ -865,17 +865,17 @@ static void x_child_init(apr_pool_t *p, 
 }
 
 /*
- * The hook runner for ap_hook_http_scheme is aliased to ap_http_scheme(), 
- * a routine that the core and other modules call when they need to know 
+ * The hook runner for ap_hook_http_scheme is aliased to ap_http_scheme(),
+ * a routine that the core and other modules call when they need to know
  * the URL scheme for the request.  For instance, mod_ssl returns "https"
- * if the server_rec associated with the request has SSL enabled. 
+ * if the server_rec associated with the request has SSL enabled.
  *
- * This hook was named 'ap_hook_http_method' in httpd 2.0. 
+ * This hook was named 'ap_hook_http_method' in httpd 2.0.
  *
- * This is a RUN_FIRST hook: the first handler to return a non NULL 
- * value aborts the handler chain.  The http_core module inserts a 
+ * This is a RUN_FIRST hook: the first handler to return a non NULL
+ * value aborts the handler chain.  The http_core module inserts a
  * fallback handler (with APR_HOOK_REALLY_LAST preference) that returns
- * "http". 
+ * "http".
  */
 static const char *x_http_scheme(const request_rec *r)
 {
@@ -891,14 +891,14 @@ static const char *x_http_scheme(const r
 /*
  * The runner for this hook is aliased to ap_default_port(), which the
  * core and other modules call when they need to know the default port
- * for a particular server.  This is used for instance to omit the 
+ * for a particular server.  This is used for instance to omit the
  * port number from a Redirect response Location header URL if the port
- * number is equal to the default port for the service (like 80 for http). 
+ * number is equal to the default port for the service (like 80 for http).
  *
- * This is a RUN_FIRST hook: the first handler to return a non-zero 
- * value is the last one executed.  The http_core module inserts a 
+ * This is a RUN_FIRST hook: the first handler to return a non-zero
+ * value is the last one executed.  The http_core module inserts a
  * fallback handler (with APR_HOOK_REALLY_LAST order specifier) that
- * returns 80. 
+ * returns 80.
  */
 static apr_port_t x_default_port(const request_rec *r)
 {
@@ -911,29 +911,29 @@ static apr_port_t x_default_port(const r
 
 /*
  * This routine is called just before the handler gets invoked. It allows
- * a module to insert a previously defined filter into the filter chain. 
- * 
+ * a module to insert a previously defined filter into the filter chain.
+ *
  * No filter has been defined by this module, so we just log the call
- * and exit. 
+ * and exit.
  *
- * This is a VOID hook: all defined handlers get called. 
+ * This is a VOID hook: all defined handlers get called.
  */
 static void x_insert_filter(request_rec *r)
 {
     /*
      * Log the call and exit.
      */
-    trace_request(r, "x_insert_filter()"); 
+    trace_request(r, "x_insert_filter()");
 }
 
-/* 
- * This routine is called to insert a previously defined error filter into 
- * the filter chain as the request is being processed. 
- * 
- * For the purpose of this example, we don't have a filter to insert, 
- * so just add to the trace and exit. 
- * 
- * This is a VOID hook: all defined handlers get called. 
+/*
+ * This routine is called to insert a previously defined error filter into
+ * the filter chain as the request is being processed.
+ *
+ * For the purpose of this example, we don't have a filter to insert,
+ * so just add to the trace and exit.
+ *
+ * This is a VOID hook: all defined handlers get called.
  */
 static void x_insert_error_filter(request_rec *r)
 {
@@ -957,30 +957,30 @@ static void x_insert_error_filter(reques
 /*
  * Sample content handler.  All this does is display the call list that has
  * been built up so far.
- * 
+ *
  * This routine gets called for every request, unless another handler earlier
- * in the callback chain has already handled the request. It is up to us to 
- * test the request_rec->handler field and see whether we are meant to handle 
- * this request. 
+ * in the callback chain has already handled the request. It is up to us to
+ * test the request_rec->handler field and see whether we are meant to handle
+ * this request.
  *
- * The content handler gets to write directly to the client using calls like 
+ * The content handler gets to write directly to the client using calls like
  * ap_rputs() and ap_rprintf()
  *
- * This is a RUN_FIRST hook. 
+ * This is a RUN_FIRST hook.
  */
 static int x_handler(request_rec *r)
 {
     x_cfg *dcfg;
-    char *note; 
+    char *note;
     void *conn_data;
     apr_status_t status;
 
     dcfg = our_dconfig(r);
-    /* 
-     * Add our trace to the log, and whether we get to write 
-     * content for this request. 
+    /*
+     * Add our trace to the log, and whether we get to write
+     * content for this request.
      */
-    note = apr_pstrcat(r->pool, "x_handler(), handler is \"", 
+    note = apr_pstrcat(r->pool, "x_handler(), handler is \"",
                       r->handler, "\"", NULL);
     trace_request(r, note);
 
@@ -990,8 +990,8 @@ static int x_handler(request_rec *r)
     }
 
     /*
-     * Set the Content-type header. Note that we do not actually have to send 
-     * the headers: this is done by the http core. 
+     * Set the Content-type header. Note that we do not actually have to send
+     * the headers: this is done by the http core.
      */
     ap_set_content_type(r, "text/html");
     /*
@@ -1046,7 +1046,7 @@ static int x_handler(request_rec *r)
             trace);
     ap_rputs("  <H2>Connection-specific callbacks so far:</H2>\n", r);
 
-    status =  apr_pool_userdata_get(&conn_data, CONN_NOTE, 
+    status =  apr_pool_userdata_get(&conn_data, CONN_NOTE,
                                     r->connection->pool);
     if ((status == APR_SUCCESS) && conn_data) {
         ap_rprintf(r, "  <OL>\n%s  </OL>\n", (char *) conn_data);
@@ -1081,17 +1081,17 @@ static int x_handler(request_rec *r)
 }
 
 /*
- * The quick_handler hook presents modules with a very powerful opportunity to 
- * serve their content in a very early request phase.  Note that this handler 
- * can not serve any requests from the file system because hooks like 
- * map_to_storage have not run.  The quick_handler hook also runs before any 
- * authentication and access control. 
- *
- * This hook is used by mod_cache to serve cached content.  
- *
- * This is a RUN_FIRST hook. Return OK if you have served the request, 
- * DECLINED if you want processing to continue, or a HTTP_* error code to stop 
- * processing the request. 
+ * The quick_handler hook presents modules with a very powerful opportunity to
+ * serve their content in a very early request phase.  Note that this handler
+ * can not serve any requests from the file system because hooks like
+ * map_to_storage have not run.  The quick_handler hook also runs before any
+ * authentication and access control.
+ *
+ * This hook is used by mod_cache to serve cached content.
+ *
+ * This is a RUN_FIRST hook. Return OK if you have served the request,
+ * DECLINED if you want processing to continue, or a HTTP_* error code to stop
+ * processing the request.
  */
 static int x_quick_handler(request_rec *r, int lookup_uri)
 {
@@ -1113,12 +1113,12 @@ static int x_quick_handler(request_rec *
  */
 static int x_pre_connection(conn_rec *c, void *csd)
 {
-    char *note; 
+    char *note;
 
     /*
      * Log the call and exit.
      */
-    note = apr_psprintf(c->pool, "x_pre_connection(c = %pp, p = %pp)", 
+    note = apr_psprintf(c->pool, "x_pre_connection(c = %pp, p = %pp)",
                         (void*) c, (void*) c->pool);
     trace_connection(c, note);
 
@@ -1136,7 +1136,7 @@ static int x_pre_connection(conn_rec *c,
 static int x_process_connection(conn_rec *c)
 {
     trace_connection(c, "x_process_connection()");
-    
+
     return DECLINED;
 }
 
@@ -1216,7 +1216,7 @@ static int x_map_to_storage(request_rec 
  * to the filename. For example this phase can be used to block evil
  * clients, while little resources were wasted on these.
  *
- * This is a RUN_ALL hook. 
+ * This is a RUN_ALL hook.
  */
 static int x_header_parser(request_rec *r)
 {
@@ -1235,7 +1235,7 @@ static int x_header_parser(request_rec *
  * example.)
  *
  * This is a RUN_ALL hook. The first handler to return a status other than OK
- * or DECLINED (for instance, HTTP_FORBIDDEN) aborts the callback chain. 
+ * or DECLINED (for instance, HTTP_FORBIDDEN) aborts the callback chain.
  */
 static int x_check_access(request_rec *r)
 {
@@ -1248,8 +1248,8 @@ static int x_check_access(request_rec *r
  * the request (such as looking up the user in a database and verifying that
  * the [encrypted] password sent matches the one in the database).
  *
- * This is a RUN_FIRST hook. The return value is OK, DECLINED, or some 
- * HTTP_mumble error (typically HTTP_UNAUTHORIZED).  
+ * This is a RUN_FIRST hook. The return value is OK, DECLINED, or some
+ * HTTP_mumble error (typically HTTP_UNAUTHORIZED).
  */
 static int x_check_authn(request_rec *r)
 {
@@ -1264,8 +1264,8 @@ static int x_check_authn(request_rec *r)
  * This routine is called to check to see if the resource being requested
  * requires authorisation.
  *
- * This is a RUN_FIRST hook. The return value is OK, DECLINED, or 
- * HTTP_mumble.  If we return OK, no other modules are called during this 
+ * This is a RUN_FIRST hook. The return value is OK, DECLINED, or
+ * HTTP_mumble.  If we return OK, no other modules are called during this
  * phase.
  *
  * If *all* modules return DECLINED, the request is aborted with a server
@@ -1317,7 +1317,7 @@ static int x_fixups(request_rec *r)
  * This routine is called to perform any module-specific logging activities
  * over and above the normal server things.
  *
- * This is a RUN_ALL hook. 
+ * This is a RUN_ALL hook.
  */
 static int x_log_transaction(request_rec *r)
 {
@@ -1329,13 +1329,13 @@ static int x_log_transaction(request_rec
 
 /*
  * This routine is called to find out under which user id to run suexec
- * Unless our module runs CGI programs, there is no reason for us to 
- * mess with this information. 
- * 
- * This is a RUN_FIRST hook. The return value is a pointer to an 
- * ap_unix_identity_t or NULL. 
+ * Unless our module runs CGI programs, there is no reason for us to
+ * mess with this information.
+ *
+ * This is a RUN_FIRST hook. The return value is a pointer to an
+ * ap_unix_identity_t or NULL.
  */
-static ap_unix_identity_t *x_get_suexec_identity(const request_rec *r) 
+static ap_unix_identity_t *x_get_suexec_identity(const request_rec *r)
 {
     trace_request(r, "x_get_suexec_identity()");
     return NULL;
@@ -1344,26 +1344,26 @@ static ap_unix_identity_t *x_get_suexec_
 
 /*
  * This routine is called to create a connection. This hook is implemented
- * by the Apache core: there is no known reason a module should override 
- * it. 
- * 
- * This is a RUN_FIRST hook. 
- * 
- * Return NULL to decline, a valid conn_rec pointer to accept. 
- */
-static conn_rec *x_create_connection(apr_pool_t *p, server_rec *server, 
-                                     apr_socket_t *csd, long conn_id, 
-                                     void *sbh, apr_bucket_alloc_t *alloc) 
+ * by the Apache core: there is no known reason a module should override
+ * it.
+ *
+ * This is a RUN_FIRST hook.
+ *
+ * Return NULL to decline, a valid conn_rec pointer to accept.
+ */
+static conn_rec *x_create_connection(apr_pool_t *p, server_rec *server,
+                                     apr_socket_t *csd, long conn_id,
+                                     void *sbh, apr_bucket_alloc_t *alloc)
 {
     trace_nocontext(p, __FILE__, __LINE__, "x_create_connection()");
-    return NULL; 
+    return NULL;
 }
 
 /*
- * This hook is defined in server/core.c, but it is not actually called 
- * or documented. 
- * 
- * This is a RUN_ALL hook. 
+ * This hook is defined in server/core.c, but it is not actually called
+ * or documented.
+ *
+ * This is a RUN_ALL hook.
  */
 static int x_get_mgmt_items(apr_pool_t *p, const char *val, apr_hash_t *ht)
 {
@@ -1376,14 +1376,14 @@ static int x_get_mgmt_items(apr_pool_t *
 
 /*
  * This routine gets called shortly after the request_rec structure
- * is created. It provides the opportunity to manipulae the request 
- * at a very early stage. 
+ * is created. It provides the opportunity to manipulae the request
+ * at a very early stage.
  *
- * This is a RUN_ALL hook. 
+ * This is a RUN_ALL hook.
  */
 static int x_create_request(request_rec *r)
 {
-    /* 
+    /*
      * We have a request_rec, but it is not filled in enough to give
      * us a usable configuration. So, add a trace without context.
      */
@@ -1392,10 +1392,10 @@ static int x_create_request(request_rec 
 }
 
 /*
- * This routine gets called during the startup of the MPM. 
- * No known existing module implements this hook. 
- * 
- * This is a RUN_ALL hook. 
+ * This routine gets called during the startup of the MPM.
+ * No known existing module implements this hook.
+ *
+ * This is a RUN_ALL hook.
  */
 static int x_pre_mpm(apr_pool_t *p, ap_scoreboard_e sb_type)
 {
@@ -1405,9 +1405,9 @@ static int x_pre_mpm(apr_pool_t *p, ap_s
 
 /*
  * This hook gets run periodically by a maintenance function inside
- * the MPM. Its exact purpose is unknown and undocumented at this time. 
- * 
- * This is a RUN_ALL hook. 
+ * the MPM. Its exact purpose is unknown and undocumented at this time.
+ *
+ * This is a RUN_ALL hook.
  */
 static int x_monitor(apr_pool_t *p, server_rec *s)
 {
@@ -1487,7 +1487,7 @@ static void x_register_hooks(apr_pool_t 
     ap_hook_get_mgmt_items(x_get_mgmt_items, NULL, NULL, APR_HOOK_MIDDLE);
     ap_hook_create_request(x_create_request, NULL, NULL, APR_HOOK_MIDDLE);
     ap_hook_pre_mpm(x_pre_mpm, NULL, NULL, APR_HOOK_MIDDLE);
-    ap_hook_monitor(x_monitor, NULL, NULL, APR_HOOK_MIDDLE); 
+    ap_hook_monitor(x_monitor, NULL, NULL, APR_HOOK_MIDDLE);
 }
 
 /*--------------------------------------------------------------------------*/



Mime
View raw message