httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r332309 [6/13] - in /httpd/httpd/branches/2.2.x: modules/aaa/ modules/arch/netware/ modules/arch/win32/ modules/cache/ modules/dav/fs/ modules/dav/lock/ modules/dav/main/ modules/debug/ modules/echo/ modules/experimental/ modules/filters/ m...
Date Thu, 10 Nov 2005 15:22:44 GMT
Modified: httpd/httpd/branches/2.2.x/modules/mappers/mod_actions.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/mappers/mod_actions.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/mappers/mod_actions.c (original)
+++ httpd/httpd/branches/2.2.x/modules/mappers/mod_actions.c Thu Nov 10 07:20:05 2005
@@ -23,9 +23,9 @@
  * Usage instructions:
  *
  * Action mime/type /cgi-bin/script
- * 
- * will activate /cgi-bin/script when a file of content type mime/type is 
- * requested. It sends the URL and file path of the requested document using 
+ *
+ * will activate /cgi-bin/script when a file of content type mime/type is
+ * requested. It sends the URL and file path of the requested document using
  * the standard CGI PATH_INFO and PATH_TRANSLATED environment variables.
  *
  * Script PUT /cgi-bin/script
@@ -89,7 +89,7 @@
     return new;
 }
 
-static const char *add_action(cmd_parms *cmd, void *m_v, 
+static const char *add_action(cmd_parms *cmd, void *m_v,
                               const char *type, const char *script,
                               const char *option)
 {
@@ -110,8 +110,8 @@
 static const char *set_script(cmd_parms *cmd, void *m_v,
                               const char *method, const char *script)
 {
-    action_dir_config *m = (action_dir_config *)m_v;    
-    
+    action_dir_config *m = (action_dir_config *)m_v;
+
     /* ap_method_register recognizes already registered methods,
      * so don't bother to check its previous existence explicitely.
      */

Modified: httpd/httpd/branches/2.2.x/modules/mappers/mod_alias.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/mappers/mod_alias.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/mappers/mod_alias.c (original)
+++ httpd/httpd/branches/2.2.x/modules/mappers/mod_alias.c Thu Nov 10 07:20:05 2005
@@ -16,10 +16,10 @@
 
 /*
  * http_alias.c: Stuff for dealing with directory aliases
- * 
+ *
  * Original by Rob McCool, rewritten in succession by David Robinson
  * and rst.
- * 
+ *
  */
 
 #include "apr_strings.h"
@@ -168,7 +168,7 @@
 
 static const char *add_redirect_internal(cmd_parms *cmd,
                                          alias_dir_conf *dirconf,
-                                         const char *arg1, const char *arg2, 
+                                         const char *arg1, const char *arg2,
                                          const char *arg3, int use_regex)
 {
     alias_entry *new;
@@ -258,14 +258,14 @@
                   "a regular expression and a filename"),
     AP_INIT_TAKE2("ScriptAliasMatch", add_alias_regex, "cgi-script", RSRC_CONF,
                   "a regular expression and a filename"),
-    AP_INIT_TAKE23("RedirectMatch", add_redirect_regex, 
+    AP_INIT_TAKE23("RedirectMatch", add_redirect_regex,
                    (void *) HTTP_MOVED_TEMPORARILY, OR_FILEINFO,
                    "an optional status, then a regular expression and "
                    "destination URL"),
     AP_INIT_TAKE2("RedirectTemp", add_redirect2,
                   (void *) HTTP_MOVED_TEMPORARILY, OR_FILEINFO,
                   "a document to be redirected, then the destination URL"),
-    AP_INIT_TAKE2("RedirectPermanent", add_redirect2, 
+    AP_INIT_TAKE2("RedirectPermanent", add_redirect2,
                   (void *) HTTP_MOVED_PERMANENTLY, OR_FILEINFO,
                   "a document to be redirected, then the destination URL"),
     {NULL}
@@ -331,15 +331,15 @@
                         apr_uri_t uri;
                         apr_uri_parse(r->pool, found, &uri);
                         /* Do not escape the query string or fragment. */
-                        found = apr_uri_unparse(r->pool, &uri, 
+                        found = apr_uri_unparse(r->pool, &uri,
                                                 APR_URI_UNP_OMITQUERY);
                         found = ap_escape_uri(r->pool, found);
                         if (uri.query) {
-                            found = apr_pstrcat(r->pool, found, "?", 
+                            found = apr_pstrcat(r->pool, found, "?",
                                                 uri.query, NULL);
                         }
                         if (uri.fragment) {
-                            found = apr_pstrcat(r->pool, found, "#", 
+                            found = apr_pstrcat(r->pool, found, "#",
                                                 uri.fragment, NULL);
                         }
                     }

Modified: httpd/httpd/branches/2.2.x/modules/mappers/mod_dir.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/mappers/mod_dir.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/mappers/mod_dir.c (original)
+++ httpd/httpd/branches/2.2.x/modules/mappers/mod_dir.c Thu Nov 10 07:20:05 2005
@@ -105,7 +105,7 @@
     if (r->finfo.filetype != APR_DIR) {
         return DECLINED;
     }
-    
+
     /* In case mod_mime wasn't present, and no handler was assigned. */
     if (!r->handler) {
         r->handler = DIR_MAGIC_TYPE;
@@ -120,7 +120,7 @@
                                                &dir_module);
 
     /* Redirect requests that are not '/' terminated */
-    if (r->uri[0] == '\0' || r->uri[strlen(r->uri) - 1] != '/') 
+    if (r->uri[0] == '\0' || r->uri[strlen(r->uri) - 1] != '/')
     {
         char *ifile;
 
@@ -129,8 +129,8 @@
         }
 
         /* Only redirect non-get requests if we have no note to warn
-         * that this browser cannot handle redirs on non-GET requests 
-         * (such as Microsoft's WebFolders). 
+         * that this browser cannot handle redirs on non-GET requests
+         * (such as Microsoft's WebFolders).
          */
         if ((r->method_number != M_GET)
                 && apr_table_get(r->subprocess_env, "redirect-carefully")) {
@@ -184,12 +184,12 @@
 
         /* The sub request lookup is very liberal, and the core map_to_storage
          * handler will almost always result in HTTP_OK as /foo/index.html
-         * may be /foo with PATH_INFO="/index.html", or even / with 
+         * may be /foo with PATH_INFO="/index.html", or even / with
          * PATH_INFO="/foo/index.html". To get around this we insist that the
          * the index be a regular filetype.
          *
-         * Another reason is that the core handler also makes the assumption 
-         * that if r->finfo is still NULL by the time it gets called, the 
+         * Another reason is that the core handler also makes the assumption
+         * that if r->finfo is still NULL by the time it gets called, the
          * file does not exist.
          */
         if (rr->status == HTTP_OK
@@ -198,7 +198,7 @@
             ap_internal_fast_redirect(rr, r);
             return OK;
         }
-            
+
         /* If the request returned a redirect, propagate it to the client */
 
         if (ap_is_HTTP_REDIRECT(rr->status)

Modified: httpd/httpd/branches/2.2.x/modules/mappers/mod_imagemap.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/mappers/mod_imagemap.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/mappers/mod_imagemap.c (original)
+++ httpd/httpd/branches/2.2.x/modules/mappers/mod_imagemap.c Thu Nov 10 07:20:05 2005
@@ -29,14 +29,14 @@
  *
  * Randy Terbush, randy@zyzzyva.com
  * port to Apache module format, "base_uri" and support for relative URLs
- * 
+ *
  * James H. Cloos, Jr., cloos@jhcloos.com
  * Added point datatype, using code in NCSA's version 1.8 imagemap.c
  * program, as distributed with version 1.4.1 of their server.
  * The point code is originally added by Craig Milo Rogers, Rogers@ISI.Edu
  *
  * Nathan Kurz, nate@tripod.com
- * Rewrite/reorganization.  New handling of default, base and relative URLs.  
+ * Rewrite/reorganization.  New handling of default, base and relative URLs.
  * New Configuration directives:
  *    ImapMenu {none, formatted, semiformatted, unformatted}
  *    ImapDefault {error, nocontent, referer, menu, URL}
@@ -415,7 +415,7 @@
 
         if (directory && (slen = strlen(directory))) {
 
-            /* for each '..',  knock a directory off the end 
+            /* for each '..',  knock a directory off the end
                by ending the string right at the last slash.
                But only consider the directory portion: don't eat
                into the server name.  And only try if a directory
@@ -591,7 +591,7 @@
     char *imap_default;
     char *imap_base;
 
-    ap_configfile_t *imap; 
+    ap_configfile_t *imap;
 
     icr = ap_get_module_config(r->per_dir_config, &imagemap_module);
 

Modified: httpd/httpd/branches/2.2.x/modules/mappers/mod_negotiation.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/mappers/mod_negotiation.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/mappers/mod_negotiation.c (original)
+++ httpd/httpd/branches/2.2.x/modules/mappers/mod_negotiation.c Thu Nov 10 07:20:05 2005
@@ -381,7 +381,7 @@
         /* better only one division later, than dealing with fscking
          * IEEE format 0.1 factors ...
          */
-        int i = 0;        
+        int i = 0;
 
         if (*++string >= '0' && *string <= '9') {
             i += (*string - '0') * 100;

Modified: httpd/httpd/branches/2.2.x/modules/mappers/mod_rewrite.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/mappers/mod_rewrite.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/mappers/mod_rewrite.c (original)
+++ httpd/httpd/branches/2.2.x/modules/mappers/mod_rewrite.c Thu Nov 10 07:20:05 2005
@@ -866,7 +866,7 @@
 
     if (rv == APR_SUCCESS) {
         apr_finfo_t sb;
-        
+
         if (apr_stat(&sb, statpath, APR_FINFO_MIN, pool) == APR_SUCCESS) {
             return 1;
         }
@@ -1296,7 +1296,7 @@
     apr_datum_t dbmval;
     char *value;
 
-    if (apr_dbm_open_ex(&dbmfp, dbmtype, file, APR_DBM_READONLY, APR_OS_DEFAULT, 
+    if (apr_dbm_open_ex(&dbmfp, dbmtype, file, APR_DBM_READONLY, APR_OS_DEFAULT,
                         r->pool) != APR_SUCCESS) {
         return NULL;
     }
@@ -1421,7 +1421,7 @@
             else if (i) {
                 curbuf->next = apr_palloc(r->pool, sizeof(*buflist));
                 curbuf = curbuf->next;
-                
+
             }
             curbuf->next = NULL;
 
@@ -1768,7 +1768,7 @@
                 return (char *)result;
             }
             break;
-            
+
         case  5:
             if (!strcmp(var, "HTTPS")) {
                 int flag = rewrite_is_https && rewrite_is_https(r->connection);
@@ -4532,7 +4532,7 @@
                 cp = r->filename + skip;
 
                 if ((cp = ap_strchr(cp, '/')) != NULL && *(++cp)) {
-                    rewritelog((r, 2, dconf->directory, 
+                    rewritelog((r, 2, dconf->directory,
                                 "trying to replace prefix %s with %s",
                                 dconf->directory, dconf->baseurl));
 

Modified: httpd/httpd/branches/2.2.x/modules/mappers/mod_so.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/mappers/mod_so.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/mappers/mod_so.c (original)
+++ httpd/httpd/branches/2.2.x/modules/mappers/mod_so.c Thu Nov 10 07:20:05 2005
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-/* 
+/*
  * This module is used to load Apache modules at runtime. This means that the
  * server functionality can be extended without recompiling and even without
- * taking the server down at all. Only a HUP or AP_SIG_GRACEFUL signal 
+ * taking the server down at all. Only a HUP or AP_SIG_GRACEFUL signal
  * needs to be sent to the server to reload the dynamically loaded modules.
  *
  * To use, you'll first need to build your module as a shared library, then
@@ -40,7 +40,7 @@
  *
  * To use the shared module, move the .so file(s) into an appropriate
  * directory. You might like to create a directory called "modules" under you
- * server root for this (e.g. /usr/local/httpd/modules). 
+ * server root for this (e.g. /usr/local/httpd/modules).
  *
  * Then edit your conf/httpd.conf file, and add LoadModule lines. For
  * example
@@ -56,8 +56,8 @@
  * directive to get these log messages).
  *
  * If you edit the LoadModule directives while the server is live you can get
- * Apache to re-load the modules by sending it a HUP or AP_SIG_GRACEFUL 
- * signal as normal.  You can use this to dynamically change the capability 
+ * Apache to re-load the modules by sending it a HUP or AP_SIG_GRACEFUL
+ * signal as normal.  You can use this to dynamically change the capability
  * of your server without bringing it down.
  *
  * Because currently there is only limited builtin support in the Configure
@@ -114,7 +114,7 @@
     so_server_conf *soc;
 
     soc = (so_server_conf *)apr_pcalloc(p, sizeof(so_server_conf));
-    soc->loaded_modules = apr_array_make(p, DYNAMIC_MODULE_LIMIT, 
+    soc->loaded_modules = apr_array_make(p, DYNAMIC_MODULE_LIMIT,
                                      sizeof(ap_module_symbol_t));
 
     return (void *)soc;
@@ -144,12 +144,12 @@
     return APR_SUCCESS;
 }
 
-/* 
+/*
  * This is called for the directive LoadModule and actually loads
  * a shared object file into the address space of the server process.
  */
 
-static const char *load_module(cmd_parms *cmd, void *dummy, 
+static const char *load_module(cmd_parms *cmd, void *dummy,
                                const char *modname, const char *filename)
 {
     apr_dso_handle_t *modhandle;
@@ -169,16 +169,16 @@
     *(ap_directive_t **)dummy = NULL;
 
     if (!szModuleFile) {
-        return apr_pstrcat(cmd->pool, "Invalid LoadModule path ", 
+        return apr_pstrcat(cmd->pool, "Invalid LoadModule path ",
                            filename, NULL);
     }
 
-    /* 
+    /*
      * check for already existing module
-     * If it already exists, we have nothing to do 
+     * If it already exists, we have nothing to do
      * Check both dynamically-loaded modules and statically-linked modules.
      */
-    sconf = (so_server_conf *)ap_get_module_config(cmd->server->module_config, 
+    sconf = (so_server_conf *)ap_get_module_config(cmd->server->module_config,
                                                 &so_module);
     modie = (ap_module_symbol_t *)sconf->loaded_modules->elts;
     for (i = 0; i < sconf->loaded_modules->nelts; i++) {
@@ -255,7 +255,7 @@
         char my_error[256];
 
         return apr_pstrcat(cmd->pool, "Can't locate API module structure `",
-                          modname, "' in file ", szModuleFile, ": ", 
+                          modname, "' in file ", szModuleFile, ": ",
                           apr_dso_error(modhandle, my_error, sizeof(my_error)),
                           NULL);
     }
@@ -263,9 +263,9 @@
     modp->dynamic_load_handle = (apr_dso_handle_t *)modhandle;
     modi->modp = modp;
 
-    /* 
+    /*
      * Make sure the found module structure is really a module structure
-     * 
+     *
      */
     if (modp->magic != MODULE_MAGIC_COOKIE) {
         return apr_pstrcat(cmd->pool, "API module structure `", modname,
@@ -273,7 +273,7 @@
                           " perhaps this is not an Apache module DSO?", NULL);
     }
 
-    /* 
+    /*
      * Add this module to the Apache core structures
      */
     error = ap_add_loaded_module(modp, cmd->pool);
@@ -281,14 +281,14 @@
         return error;
     }
 
-    /* 
+    /*
      * Register a cleanup in the config apr_pool_t (normally pconf). When
      * we do a restart (or shutdown) this cleanup will cause the
      * shared object to be unloaded.
      */
     apr_pool_cleanup_register(cmd->pool, modi, unload_module, apr_pool_cleanup_null);
 
-    /* 
+    /*
      * Finally we need to run the configuration process for the module
      */
     ap_single_module_configure(cmd->pool, cmd->server, modp);
@@ -296,7 +296,7 @@
     return NULL;
 }
 
-/* 
+/*
  * This implements the LoadFile directive and loads an arbitrary
  * shared object file into the adress space of the server process.
  */
@@ -307,21 +307,21 @@
     const char *file;
 
     file = ap_server_root_relative(cmd->pool, filename);
-    
+
     if (!file) {
-        return apr_pstrcat(cmd->pool, "Invalid LoadFile path ", 
+        return apr_pstrcat(cmd->pool, "Invalid LoadFile path ",
                            filename, NULL);
     }
 
     if (apr_dso_load(&handle, file, cmd->pool) != APR_SUCCESS) {
         char my_error[256];
 
-        return apr_pstrcat(cmd->pool, "Cannot load ", filename, 
-                          " into server: ", 
+        return apr_pstrcat(cmd->pool, "Cannot load ", filename,
+                          " into server: ",
                           apr_dso_error(handle, my_error, sizeof(my_error)),
                           NULL);
     }
-    
+
     ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, NULL,
                  "loaded file %s", filename);
 
@@ -335,7 +335,7 @@
     ap_module_symbol_t *modie;
     int i;
 
-    sconf = (so_server_conf *)ap_get_module_config(s->module_config, 
+    sconf = (so_server_conf *)ap_get_module_config(s->module_config,
                                                    &so_module);
     modie = (ap_module_symbol_t *)sconf->loaded_modules->elts;
 
@@ -364,7 +364,7 @@
 
     apr_file_printf(out, "Loaded Modules:\n");
 
-    sconf = (so_server_conf *)ap_get_module_config(s->module_config, 
+    sconf = (so_server_conf *)ap_get_module_config(s->module_config,
                                                    &so_module);
     for (i = 0; ; i++) {
         modi = &ap_prelinked_module_symbols[i];
@@ -389,15 +389,15 @@
 
 static const char *load_file(cmd_parms *cmd, void *dummy, const char *filename)
 {
-    ap_log_perror(APLOG_MARK, APLOG_STARTUP, 0, cmd->pool, 
+    ap_log_perror(APLOG_MARK, APLOG_STARTUP, 0, cmd->pool,
                  "WARNING: LoadFile not supported on this platform");
     return NULL;
 }
 
-static const char *load_module(cmd_parms *cmd, void *dummy, 
+static const char *load_module(cmd_parms *cmd, void *dummy,
                                const char *modname, const char *filename)
 {
-    ap_log_perror(APLOG_MARK, APLOG_STARTUP, 0, cmd->pool, 
+    ap_log_perror(APLOG_MARK, APLOG_STARTUP, 0, cmd->pool,
                  "WARNING: LoadModule not supported on this platform");
     return NULL;
 }

Modified: httpd/httpd/branches/2.2.x/modules/mappers/mod_speling.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/mappers/mod_speling.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/mappers/mod_speling.c (original)
+++ httpd/httpd/branches/2.2.x/modules/mappers/mod_speling.c Thu Nov 10 07:20:05 2005
@@ -239,7 +239,7 @@
     filoc = ap_rind(r->filename, '/');
     /*
      * Don't do anything if the request doesn't contain a slash, or
-     * requests "/" 
+     * requests "/"
      */
     if (filoc == -1 || strcmp(r->uri, "/") == 0) {
         return DECLINED;
@@ -376,8 +376,8 @@
               sizeof(misspelled_file), sort_by_quality);
 
         /*
-         * Conditions for immediate redirection: 
-         *     a) the first candidate was not found by stripping the suffix 
+         * Conditions for immediate redirection:
+         *     a) the first candidate was not found by stripping the suffix
          * AND b) there exists only one candidate OR the best match is not
          *        ambiguous
          * then return a redirection right away.
@@ -396,7 +396,7 @@
                           ap_construct_url(r->pool, nuri, r));
 
             ap_log_rerror(APLOG_MARK, APLOG_INFO, APR_SUCCESS,
-                          r, 
+                          r,
                           ref ? "Fixed spelling: %s to %s from %s"
                               : "Fixed spelling: %s to %s",
                           r->uri, nuri, ref);
@@ -478,7 +478,7 @@
                 if (i > 0 && i < candidates->nelts - 1
                     && variant[i].quality != SP_VERYDIFFERENT
                     && variant[i + 1].quality == SP_VERYDIFFERENT) {
-                    *(const char **)apr_array_push(t) = 
+                    *(const char **)apr_array_push(t) =
                                    "</ul>\nFurthermore, the following related "
                                    "documents were found:\n<ul>\n";
                 }
@@ -501,7 +501,7 @@
 
             apr_table_mergen(r->subprocess_env, "VARIANTS",
                             apr_array_pstrcat(p, v, ','));
-          
+
             apr_pool_destroy(sub_pool);
 
             ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,

Modified: httpd/httpd/branches/2.2.x/modules/mappers/mod_userdir.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/mappers/mod_userdir.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/mappers/mod_userdir.c (original)
+++ httpd/httpd/branches/2.2.x/modules/mappers/mod_userdir.c Thu Nov 10 07:20:05 2005
@@ -73,8 +73,8 @@
 #endif
 
 
-/* 
- * The default directory in user's home dir 
+/*
+ * The default directory in user's home dir
  * In the default install, the module is disabled
  */
 #ifndef DEFAULT_USER_DIR
@@ -259,7 +259,7 @@
                  * Crummy hack. Need to figure out whether we have been
                  * redirected to a URL or to a file on some drive. Since I
                  * know of no protocols that are a single letter, ignore
-                 * a : as the first or second character, and assume a file 
+                 * a : as the first or second character, and assume a file
                  * was specified
                  */
                 if (strchr(x + 2, ':'))
@@ -300,7 +300,7 @@
          * anyway, in the hope that some handler might handle it. This can be
          * used, for example, to run a CGI script for the user.
          */
-        if (filename && (!*userdirs 
+        if (filename && (!*userdirs
                       || ((rv = apr_stat(&statbuf, filename, APR_FINFO_MIN,
                                          r->pool)) == APR_SUCCESS
                                              || rv == APR_INCOMPLETE))) {
@@ -342,7 +342,7 @@
     }
 
     ugid->userdir = 1;
-#endif 
+#endif
     return ugid;
 }
 #endif /* HAVE_UNIX_SUEXEC */

Modified: httpd/httpd/branches/2.2.x/modules/mappers/mod_vhost_alias.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/mappers/mod_vhost_alias.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/mappers/mod_vhost_alias.c (original)
+++ httpd/httpd/branches/2.2.x/modules/mappers/mod_vhost_alias.c Thu Nov 10 07:20:05 2005
@@ -16,7 +16,7 @@
 
 /*
  * mod_vhost_alias.c: support for dynamically configured mass virtual hosting
- * 
+ *
  * Copyright (c) 1998-1999 Demon Internet Ltd.
  *
  * This software was submitted by Demon Internet to the Apache Software Foundation
@@ -123,7 +123,7 @@
     mva_mode_e mode, *pmode;
     const char **pmap;
     const char *p;
-  
+
     conf = (mva_sconf_t *) ap_get_module_config(cmd->server->module_config,
                                                 &vhost_alias_module);
     /* there ought to be a better way of doing this */
@@ -214,17 +214,17 @@
 
 static const command_rec mva_commands[] =
 {
-    AP_INIT_TAKE1("VirtualScriptAlias", vhost_alias_set, 
-                  &vhost_alias_set_cgi_root_name, RSRC_CONF, 
+    AP_INIT_TAKE1("VirtualScriptAlias", vhost_alias_set,
+                  &vhost_alias_set_cgi_root_name, RSRC_CONF,
                   "how to create a ScriptAlias based on the host"),
-    AP_INIT_TAKE1("VirtualDocumentRoot", vhost_alias_set, 
-                  &vhost_alias_set_doc_root_name, RSRC_CONF, 
+    AP_INIT_TAKE1("VirtualDocumentRoot", vhost_alias_set,
+                  &vhost_alias_set_doc_root_name, RSRC_CONF,
                   "how to create the DocumentRoot based on the host"),
-    AP_INIT_TAKE1("VirtualScriptAliasIP", vhost_alias_set, 
-                  &vhost_alias_set_cgi_root_ip, RSRC_CONF, 
+    AP_INIT_TAKE1("VirtualScriptAliasIP", vhost_alias_set,
+                  &vhost_alias_set_cgi_root_ip, RSRC_CONF,
                   "how to create a ScriptAlias based on the host"),
-    AP_INIT_TAKE1("VirtualDocumentRootIP", vhost_alias_set, 
-                  &vhost_alias_set_doc_root_ip, RSRC_CONF, 
+    AP_INIT_TAKE1("VirtualDocumentRootIP", vhost_alias_set,
+                  &vhost_alias_set_doc_root_ip, RSRC_CONF,
                   "how to create the DocumentRoot based on the host"),
     { NULL }
 };
@@ -276,7 +276,7 @@
     dots[ndots] = p;
 
     r->filename = NULL;
-  
+
     dest = buf;
     last = '\0';
     while (*map) {
@@ -386,7 +386,7 @@
     const char *name, *map, *uri;
     mva_mode_e mode;
     const char *cgi;
-  
+
     conf = (mva_sconf_t *) ap_get_module_config(r->server->module_config,
                                               &vhost_alias_module);
     cgi = NULL;
@@ -409,7 +409,7 @@
     else {
         return DECLINED;
     }
-  
+
     if (mode == VHOST_ALIAS_NAME) {
         name = ap_get_server_name(r);
     }
@@ -421,7 +421,7 @@
     }
 
     /* ### There is an optimization available here to determine the
-     * absolute portion of the path from the server config phase, 
+     * absolute portion of the path from the server config phase,
      * through the first % segment, and note that portion of the path
      * canonical_path buffer.
      */

Modified: httpd/httpd/branches/2.2.x/modules/metadata/mod_cern_meta.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/metadata/mod_cern_meta.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/metadata/mod_cern_meta.c (original)
+++ httpd/httpd/branches/2.2.x/modules/metadata/mod_cern_meta.c Thu Nov 10 07:20:05 2005
@@ -18,13 +18,13 @@
  * mod_cern_meta.c
  * version 0.1.0
  * status beta
- * 
+ *
  * Andrew Wilson <Andrew.Wilson@cm.cf.ac.uk> 25.Jan.96
  *
  * *** IMPORTANT ***
  * This version of mod_cern_meta.c controls Meta File behaviour on a
  * per-directory basis.  Previous versions of the module defined behaviour
- * on a per-server basis.  The upshot is that you'll need to revisit your 
+ * on a per-server basis.  The upshot is that you'll need to revisit your
  * configuration files in order to make use of the new module.
  * ***
  *
@@ -38,30 +38,30 @@
  * who can exploit this module.  It should be noted that there are probably
  * more sensitive ways of managing the Expires: header specifically.
  *
- * The module obeys the following directives, which can appear 
+ * The module obeys the following directives, which can appear
  * in the server's .conf files and in .htaccess files.
  *
- *  MetaFiles <on|off> 
+ *  MetaFiles <on|off>
  *
- *    turns on|off meta file processing for any directory.  
+ *    turns on|off meta file processing for any directory.
  *    Default value is off
  *
  *        # turn on MetaFiles in this directory
  *        MetaFiles on
  *
  *  MetaDir <directory name>
- *      
+ *
  *    specifies the name of the directory in which Apache can find
  *    meta information files.  The directory is usually a 'hidden'
  *    subdirectory of the directory that contains the file being
  *    accessed.  eg:
  *
- *        # .meta files are in the *same* directory as the 
+ *        # .meta files are in the *same* directory as the
  *        # file being accessed
  *        MetaDir .
  *
  *    the default is to look in a '.web' subdirectory. This is the
- *    same as for CERN 3.+ webservers and behaviour is the same as 
+ *    same as for CERN 3.+ webservers and behaviour is the same as
  *    for the directive:
  *
  *        MetaDir .web
@@ -87,7 +87,7 @@
  *
  *   DOCUMENT_ROOT/somedir/.web/index.html.meta
  *
- * and will use its contents to generate additional MIME header 
+ * and will use its contents to generate additional MIME header
  * information.
  *
  * For more information on the CERN Meta file semantics see:
@@ -98,7 +98,7 @@
  * 29.Jan.96 pfopen/pfclose instead of fopen/fclose
  *           DECLINE when real file not found, we may be checking each
  *           of the index.html/index.shtml/index.htm variants and don't
- *           need to report missing ones as spurious errors. 
+ *           need to report missing ones as spurious errors.
  * 31.Jan.96 log_error reports about a malformed .meta file, rather
  *           than a script error.
  * 20.Jun.96 MetaFiles <on|off> default off, added, so that module

Modified: httpd/httpd/branches/2.2.x/modules/metadata/mod_env.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/metadata/mod_env.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/metadata/mod_env.c (original)
+++ httpd/httpd/branches/2.2.x/modules/metadata/mod_env.c Thu Nov 10 07:20:05 2005
@@ -55,14 +55,14 @@
 
     int i;
 
-    /* 
+    /*
      * res->vars = copy_table( p, base->vars );
      * foreach $unsetenv ( @add->unsetenv )
      *     table_unset( res->vars, $unsetenv );
      * foreach $element ( @add->vars )
      *     table_set( res->vars, $element.key, $element.val );
      *
-     * add->unsetenv already removed the vars from add->vars, 
+     * add->unsetenv already removed the vars from add->vars,
      * if they preceeded the UnsetEnv directive.
      */
     res->vars = apr_table_copy(p, base->vars);
@@ -95,7 +95,7 @@
     env_dir_config_rec *sconf = sconf_;
     apr_table_t *vars = sconf->vars;
     const char *env_var;
-    
+
     env_var = getenv(arg);
     if (env_var != NULL) {
         apr_table_setn(vars, arg, apr_pstrdup(cmd->pool, env_var));
@@ -112,7 +112,7 @@
                                            const char *name, const char *value)
 {
     env_dir_config_rec *sconf = sconf_;
-    
+
     /* name is mandatory, value is optional.  no value means
      * set the variable to an empty string
      */

Modified: httpd/httpd/branches/2.2.x/modules/metadata/mod_expires.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/metadata/mod_expires.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/metadata/mod_expires.c (original)
+++ httpd/httpd/branches/2.2.x/modules/metadata/mod_expires.c Thu Nov 10 07:20:05 2005
@@ -18,13 +18,13 @@
  * mod_expires.c
  * version 0.0.11
  * status beta
- * 
+ *
  * Andrew Wilson <Andrew.Wilson@cm.cf.ac.uk> 26.Jan.96
  *
  * This module allows you to control the form of the Expires: header
  * that Apache issues for each access.  Directives can appear in
  * configuration files or in .htaccess files so expiry semantics can
- * be defined on a per-directory basis.  
+ * be defined on a per-directory basis.
  *
  * DIRECTIVE SYNTAX
  *
@@ -56,7 +56,7 @@
  *
  * Another example, our html pages can change all the time, the gifs
  * tend not to change often:
- * 
+ *
  *     # pages are hot (1 week), images are cold (1 month)
  *     ExpiresByType text/html A604800
  *     ExpiresByType image/gif A2592000
@@ -85,7 +85,7 @@
  *     ExpiresByType type/encoding "<base> [plus] {<num> <type>}*"
  *
  * where <base> is one of:
- *      access  
+ *      access
  *      now             equivalent to 'access'
  *      modification
  *
@@ -134,8 +134,8 @@
  *              rely on presence of HTTP_TIME_FORMAT in Apache 1.1+.
  * 21.Feb.96    This version (0.0.9) reverses assumptions made in 0.0.8
  *              about star/star handlers.  Reverting to 0.0.7 behaviour.
- * 08.Jun.96    allows ExpiresDefault to be used with responses that use 
- *              the DefaultType by not DECLINING, but instead skipping 
+ * 08.Jun.96    allows ExpiresDefault to be used with responses that use
+ *              the DefaultType by not DECLINING, but instead skipping
  *              the table_get check and then looking for an ExpiresDefault.
  *              [Rob Hartill]
  * 04.Nov.96    'const' definitions added.
@@ -324,7 +324,7 @@
     if ((strlen(++check) == 1) && (*check == '*')) {
         dir_config->wildcards = 1;
     }
-    
+
     if ((response = check_code(cmd->pool, code, &real_code)) == NULL) {
         apr_table_setn(dir_config->expiresbytype, mime, real_code);
         return NULL;
@@ -399,7 +399,7 @@
 
     switch (code[0]) {
     case 'M':
-        if (r->finfo.filetype == 0) { 
+        if (r->finfo.filetype == 0) {
             /* file doesn't exist on disk, so we can't do anything based on
              * modification time.  Note that this does _not_ log an error.
              */
@@ -410,7 +410,7 @@
         additional = apr_time_from_sec(additional_sec);
         break;
     case 'A':
-        /* there's been some discussion and it's possible that 
+        /* there's been some discussion and it's possible that
          * 'access time' will be stored in request structure
          */
         base = r->request_time;
@@ -418,7 +418,7 @@
         additional = apr_time_from_sec(additional_sec);
         break;
     default:
-        /* expecting the add_* routines to be case-hardened this 
+        /* expecting the add_* routines to be case-hardened this
          * is just a reminder that module is beta
          */
         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
@@ -472,7 +472,7 @@
          * this module.  First, check to see if there is an applicable
          * ExpiresByType directive.
          */
-        expiry = apr_table_get(conf->expiresbytype, 
+        expiry = apr_table_get(conf->expiresbytype,
                                ap_field_noparam(r->pool, r->content_type));
         if (expiry == NULL) {
             int usedefault = 1;
@@ -530,7 +530,7 @@
     conf = (expires_dir_config *) ap_get_module_config(r->per_dir_config,
                                                        &expires_module);
 
-    /* Check to see if the filter is enabled and if there are any applicable 
+    /* Check to see if the filter is enabled and if there are any applicable
      * config directives for this directory scope
      */
     if (conf->active != ACTIVE_ON ||

Modified: httpd/httpd/branches/2.2.x/modules/metadata/mod_headers.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/metadata/mod_headers.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/metadata/mod_headers.c (original)
+++ httpd/httpd/branches/2.2.x/modules/metadata/mod_headers.c Thu Nov 10 07:20:05 2005
@@ -43,8 +43,8 @@
  *
  * When the request is processed, the header directives are processed in
  * this order: firstly, the main server, then the virtual server handling
- * this request (if any), then any <Directory> sections (working downwards 
- * from the root dir), then an <Location> sections (working down from 
+ * this request (if any), then any <Directory> sections (working downwards
+ * from the root dir), then an <Location> sections (working down from
  * shortest URL component), the any <File> sections. This order is
  * important if any 'set' or 'unset' actions are used. For example,
  * the following two directives have different effect if applied in
@@ -100,7 +100,7 @@
 static char hdr_err = '2';  /* Header always */
 
 /*
- * There is an array of struct format_tag per Header/RequestHeader 
+ * There is an array of struct format_tag per Header/RequestHeader
  * config directive
  */
 typedef struct {
@@ -151,8 +151,8 @@
 }
 static const char *header_request_duration(request_rec *r, char *a)
 {
-    return apr_psprintf(r->pool, "D=%" APR_TIME_T_FMT, 
-                        (apr_time_now() - r->request_time)); 
+    return apr_psprintf(r->pool, "D=%" APR_TIME_T_FMT,
+                        (apr_time_now() - r->request_time));
 }
 static const char *header_request_time(request_rec *r, char *a)
 {
@@ -165,9 +165,9 @@
 {
     if (ap_strchr_c(hdr, APR_ASCII_LF) || ap_strchr_c(hdr, APR_ASCII_CR)) {
         char *ptr;
-        
+
         hdr = ptr = apr_pstrdup(p, hdr);
-        
+
         do {
             if (*ptr == APR_ASCII_LF || *ptr == APR_ASCII_CR)
                 *ptr = APR_ASCII_BLANK;
@@ -189,7 +189,7 @@
 static const char *header_request_ssl_var(request_rec *r, char *name)
 {
     if (header_ssl_lookup) {
-        const char *val = header_ssl_lookup(r->pool, r->server, 
+        const char *val = header_ssl_lookup(r->pool, r->server,
                                             r->connection, r, name);
         if (val && val[0])
             return unwrap_header(r->pool, val);
@@ -231,7 +231,7 @@
 
     return newconf;
 }
- 
+
 static char *parse_misc_string(apr_pool_t *p, format_tag *tag, const char **sa)
 {
     const char *s;
@@ -270,7 +270,7 @@
                 *d++ = '\n';
                 s++;
                 break;
-            case 't':   
+            case 't':
                 *d++ = '\t';
                 s++;
                 break;
@@ -293,7 +293,7 @@
 }
 
 static char *parse_format_tag(apr_pool_t *p, format_tag *tag, const char **sa)
-{ 
+{
     const char *s = *sa;
     const char * (*tag_handler)(request_rec *,char *);
 
@@ -333,13 +333,13 @@
 }
 
 /*
- * A format string consists of white space, text and optional format 
- * tags in any order. E.g., 
+ * A format string consists of white space, text and optional format
+ * tags in any order. E.g.,
  *
  * Header add MyHeader "Free form text %D %t more text"
  *
  * Decompose the format string into its tags. Each tag (struct format_tag)
- * contains a pointer to the function used to format the tag. Then save each 
+ * contains a pointer to the function used to format the tag. Then save each
  * tag in the tag array anchored in the header_entry.
  */
 static char *parse_format_string(apr_pool_t *p, header_entry *hdr, const char *s)
@@ -446,7 +446,7 @@
             condition_var = envclause + 4;
         }
     }
-    
+
     if ((colon = ap_strchr_c(hdr, ':'))) {
         hdr = apr_pstrmemdup(cmd->pool, hdr, colon-hdr);
     }
@@ -489,23 +489,23 @@
 }
 
 /*
- * Process the tags in the format string. Tags may be format specifiers 
+ * Process the tags in the format string. Tags may be format specifiers
  * (%D, %t, etc.), whitespace or text strings. For each tag, run the handler
  * (formatter) specific to the tag. Handlers return text strings.
- * Concatenate the return from each handler into one string that is 
+ * Concatenate the return from each handler into one string that is
  * returned from this call.
  */
-static char* process_tags(header_entry *hdr, request_rec *r) 
+static char* process_tags(header_entry *hdr, request_rec *r)
 {
     int i;
     const char *s;
     char *str = NULL;
 
     format_tag *tag = (format_tag*) hdr->ta->elts;
- 
+
     for (i = 0; i < hdr->ta->nelts; i++) {
         s = tag[i].func(r, tag[i].arg);
-        if (str == NULL) 
+        if (str == NULL)
             str = apr_pstrdup(r->pool, s);
         else
             str = apr_pstrcat(r->pool, str, s, NULL);
@@ -515,7 +515,7 @@
 
 static int echo_header(echo_do *v, const char *key, const char *val)
 {
-    /* If the input header (key) matches the regex, echo it intact to 
+    /* If the input header (key) matches the regex, echo it intact to
      * r->headers_out.
      */
     if (!ap_regexec(v->hdr->regex, key, 0, NULL, 0)) {
@@ -572,7 +572,7 @@
             echo_do v;
             v.r = r;
             v.hdr = hdr;
-            apr_table_do((int (*) (void *, const char *, const char *)) 
+            apr_table_do((int (*) (void *, const char *, const char *))
                          echo_header, (void *) &v, r->headers_in, NULL);
             break;
         }

Modified: httpd/httpd/branches/2.2.x/modules/metadata/mod_mime_magic.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/metadata/mod_mime_magic.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/metadata/mod_mime_magic.c (original)
+++ httpd/httpd/branches/2.2.x/modules/metadata/mod_mime_magic.c Thu Nov 10 07:20:05 2005
@@ -229,7 +229,7 @@
 static int mcheck(request_rec *, union VALUETYPE *, struct magic *);
 static void mprint(request_rec *, union VALUETYPE *, struct magic *);
 
-static int uncompress(request_rec *, int, 
+static int uncompress(request_rec *, int,
                       unsigned char **, apr_size_t);
 static long from_oct(int, char *);
 static int fsmagic(request_rec *r, const char *fn);
@@ -885,7 +885,7 @@
     /*
      * Try compression stuff
      */
-        if (checkzmagic == 1) {  
+        if (checkzmagic == 1) {
                         if (zmagic(r, buf, nb) == 1)
                         return OK;
         }
@@ -933,8 +933,8 @@
         ap_log_error(APLOG_MARK, APLOG_ERR, APR_EBADPATH, s,
                      MODNAME ": Invalid magic file path %s", conf->magicfile);
         return -1;
-    }        
-    if ((result = apr_file_open(&f, fname, APR_READ | APR_BUFFERED, 
+    }
+    if ((result = apr_file_open(&f, fname, APR_READ | APR_BUFFERED,
                                 APR_OS_DEFAULT, p) != APR_SUCCESS)) {
         ap_log_error(APLOG_MARK, APLOG_ERR, result, s,
                      MODNAME ": can't read magic file %s", fname);
@@ -957,7 +957,7 @@
             *last = '\0';
             --last;
         }
-        
+
         /* skip leading whitespace */
         ws_offset = 0;
         while (line[ws_offset] && apr_isspace(line[ws_offset])) {
@@ -2127,16 +2127,16 @@
     apr_procattr_t *procattr;
     apr_proc_t *procnew;
 
-    /* XXX missing 1.3 logic: 
+    /* XXX missing 1.3 logic:
      *
      * what happens when !compr[parm->method].silent?
      * Should we create the err pipe, read it, and copy to the log?
      */
-        
+
     env = (const char *const *)ap_create_environment(child_context, r->subprocess_env);
 
     if ((apr_procattr_create(&procattr, child_context) != APR_SUCCESS) ||
-        (apr_procattr_io_set(procattr, APR_FULL_BLOCK, 
+        (apr_procattr_io_set(procattr, APR_FULL_BLOCK,
                            APR_FULL_BLOCK, APR_NO_PIPE)   != APR_SUCCESS) ||
         (apr_procattr_dir_set(procattr, r->filename)        != APR_SUCCESS) ||
         (apr_procattr_cmdtype_set(procattr, APR_PROGRAM)    != APR_SUCCESS)) {
@@ -2169,7 +2169,7 @@
     return (rc);
 }
 
-static int uncompress(request_rec *r, int method, 
+static int uncompress(request_rec *r, int method,
                       unsigned char **newch, apr_size_t n)
 {
     struct uncompress_parms parm;
@@ -2341,7 +2341,7 @@
                 apr_pstrdup(r->pool, sub->content_encoding);
         if (sub->content_languages) {
             int n;
-            r->content_languages = apr_array_copy(r->pool, 
+            r->content_languages = apr_array_copy(r->pool,
                                                   sub->content_languages);
             for (n = 0; n < r->content_languages->nelts; ++n) {
                 char **lang = ((char **)r->content_languages->elts) + n;

Modified: httpd/httpd/branches/2.2.x/modules/metadata/mod_setenvif.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/metadata/mod_setenvif.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/metadata/mod_setenvif.c (original)
+++ httpd/httpd/branches/2.2.x/modules/metadata/mod_setenvif.c Thu Nov 10 07:20:05 2005
@@ -18,7 +18,7 @@
  * mod_setenvif.c
  * Set environment variables based on matching request headers or
  * attributes against regex strings
- * 
+ *
  * Paul Sutton <paul@ukweb.com> 27 Oct 1996
  * Based on mod_browser by Alexei Kosut <akosut@organic.com>
  */
@@ -34,12 +34,12 @@
  *
  * where name is either a HTTP request header name, or one of the
  * special values (see below). 'name' may be a regex when it is used
- * to specify an HTTP request header name. The 'value' of the header 
+ * to specify an HTTP request header name. The 'value' of the header
  & (or the value of the special value from below) are compared against
  * the regex argument. If this is a simple string, a simple sub-string
  * match is performed. Otherwise, a request expression match is
  * done. If the value matches the string or regular expression, the
- * environment variables listed as var ... are set. Each var can 
+ * environment variables listed as var ... are set. Each var can
  * be in one of three formats: var, which sets the named variable
  * (the value value "1"); var=value, which sets the variable to
  * the given value; or !var, which unsets the variable is it has
@@ -165,7 +165,7 @@
 #define ICASE_MAGIC	((void *)(&setenvif_module))
 #define SEI_MAGIC_HEIRLOOM "setenvif-phase-flag"
 
-static int is_header_regex(apr_pool_t *p, const char* name) 
+static int is_header_regex(apr_pool_t *p, const char* name)
 {
     /* If a Header name contains characters other than:
      *    -,_,[A-Z\, [a-z] and [0-9].
@@ -510,7 +510,7 @@
                     elts = (const apr_table_entry_t *) arr->elts;
                     val = NULL;
                     for (j = 0; j < arr->nelts; ++j) {
-                        if (!ap_regexec(b->pnamereg, elts[j].key, 0, NULL, 0)) { 
+                        if (!ap_regexec(b->pnamereg, elts[j].key, 0, NULL, 0)) {
                             val = elts[j].val;
                         }
                     }

Modified: httpd/httpd/branches/2.2.x/modules/metadata/mod_unique_id.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/metadata/mod_unique_id.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/metadata/mod_unique_id.c (original)
+++ httpd/httpd/branches/2.2.x/modules/metadata/mod_unique_id.c Thu Nov 10 07:20:05 2005
@@ -47,10 +47,10 @@
  * cannot guarantee the thread_id will be an integer.
  *
  * This code looks like it won't give a unique ID with the new thread logic.
- * It will.  The reason is, we don't increment the counter in a thread_safe 
+ * It will.  The reason is, we don't increment the counter in a thread_safe
  * manner.  Because the thread_index is also in the unique ID now, this does
  * not matter.  In order for the id to not be unique, the same thread would
- * have to get the same counter twice in the same second. 
+ * have to get the same counter twice in the same second.
  */
 
 /* Comments:
@@ -123,7 +123,7 @@
 /*
  * Number of elements in the structure unique_id_rec.
  */
-#define UNIQUE_ID_REC_MAX 5 
+#define UNIQUE_ID_REC_MAX 5
 
 static unsigned short unique_id_rec_offset[UNIQUE_ID_REC_MAX],
                       unique_id_rec_size[UNIQUE_ID_REC_MAX],
@@ -199,12 +199,12 @@
      * If the server is pummelled with restart requests we could possibly end
      * up in a situation where we're starting again during the same second
      * that has been used in previous identifiers.  Avoid that situation.
-     * 
+     *
      * In truth, for this to actually happen not only would it have to restart
      * in the same second, but it would have to somehow get the same pids as
      * one of the other servers that was running in that second. Which would
      * mean a 64k wraparound on pids ... not very likely at all.
-     * 
+     *
      * But protecting against it is relatively cheap.  We just sleep into the
      * next second.
      */
@@ -222,7 +222,7 @@
      * physical machine there are multiple servers (i.e. using Listen). But
      * it's guaranteed that none of them will share the same pids between
      * children.
-     * 
+     *
      * XXX: for multithread this needs to use a pid/tid combo and probably
      * needs to be expanded to 32 bits
      */
@@ -299,7 +299,7 @@
         apr_table_setn(r->subprocess_env, "UNIQUE_ID", e);
         return DECLINED;
     }
-    
+
     new_unique_id.in_addr = cur_unique_id.in_addr;
     new_unique_id.pid = cur_unique_id.pid;
     new_unique_id.counter = cur_unique_id.counter;
@@ -323,7 +323,7 @@
      */
     x[k++] = '\0';
     x[k++] = '\0';
-    
+
     /* alloc str and do the uuencoding */
     str = (char *)apr_palloc(r->pool, unique_id_rec_size_uu + 1);
     k = 0;
@@ -353,7 +353,7 @@
 {
     ap_hook_post_config(unique_id_global_init, NULL, NULL, APR_HOOK_MIDDLE);
     ap_hook_child_init(unique_id_child_init, NULL, NULL, APR_HOOK_MIDDLE);
-    ap_hook_post_read_request(gen_unique_id, NULL, NULL, APR_HOOK_MIDDLE); 
+    ap_hook_post_read_request(gen_unique_id, NULL, NULL, APR_HOOK_MIDDLE);
 }
 
 module AP_MODULE_DECLARE_DATA unique_id_module = {

Modified: httpd/httpd/branches/2.2.x/modules/metadata/mod_usertrack.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/metadata/mod_usertrack.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/metadata/mod_usertrack.c (original)
+++ httpd/httpd/branches/2.2.x/modules/metadata/mod_usertrack.c Thu Nov 10 07:20:05 2005
@@ -106,7 +106,7 @@
     dcfg = ap_get_module_config(r->per_dir_config, &usertrack_module);
 
     /* XXX: hmm, this should really tie in with mod_unique_id */
-    apr_snprintf(cookiebuf, sizeof(cookiebuf), "%s.%" APR_TIME_T_FMT, rname, 
+    apr_snprintf(cookiebuf, sizeof(cookiebuf), "%s.%" APR_TIME_T_FMT, rname,
                  apr_time_now());
 
     if (cls->expires) {
@@ -117,7 +117,7 @@
 
         if ((dcfg->style == CT_UNSET) || (dcfg->style == CT_NETSCAPE)) {
             apr_time_exp_t tms;
-            apr_time_exp_gmt(&tms, r->request_time 
+            apr_time_exp_gmt(&tms, r->request_time
                                  + apr_time_from_sec(cls->expires));
             new_cookie = apr_psprintf(r->pool,
                                        "%s; expires=%s, "
@@ -295,7 +295,7 @@
     }
 
     /*
-     * The harder case - stolen from mod_expires 
+     * The harder case - stolen from mod_expires
      *
      * CookieExpires "[plus] {<num> <type>}*"
      */

Modified: httpd/httpd/branches/2.2.x/modules/metadata/mod_version.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/metadata/mod_version.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/metadata/mod_version.c (original)
+++ httpd/httpd/branches/2.2.x/modules/metadata/mod_version.c Thu Nov 10 07:20:05 2005
@@ -17,7 +17,7 @@
 /*
  * mod_version.c
  * Allow conditional configuration depending on the httpd version
- * 
+ *
  * André Malo (nd/perlig.de), January 2004
  *
  * Some stuff coded here is heavily based on the core <IfModule>
@@ -163,7 +163,7 @@
     rc = !ap_regexec(compiled, to_match, 0, NULL, 0);
 
     ap_pregfree(pool, compiled);
-    return rc;    
+    return rc;
 }
 
 /*

Modified: httpd/httpd/branches/2.2.x/modules/proxy/ajp_header.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/proxy/ajp_header.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/ajp_header.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/ajp_header.c Thu Nov 10 07:20:05 2005
@@ -18,20 +18,20 @@
 #include "ajp.h"
 
 static const char *response_trans_headers[] = {
-    "Content-Type", 
-    "Content-Language", 
-    "Content-Length", 
-    "Date", 
-    "Last-Modified", 
-    "Location", 
-    "Set-Cookie", 
-    "Set-Cookie2", 
-    "Servlet-Engine", 
-    "Status", 
+    "Content-Type",
+    "Content-Language",
+    "Content-Length",
+    "Date",
+    "Last-Modified",
+    "Location",
+    "Set-Cookie",
+    "Set-Cookie2",
+    "Servlet-Engine",
+    "Status",
     "WWW-Authenticate"
 };
 
-static const char *long_res_header_for_sc(int sc) 
+static const char *long_res_header_for_sc(int sc)
 {
     const char *rc = NULL;
     sc = sc & 0X00FF;
@@ -56,7 +56,7 @@
      */
     if (len < 4 || len > 15)
         return UNKNOWN_METHOD;
-    
+
     while (*p)
         header[i++] = apr_toupper(*p++);
     header[i] = '\0';
@@ -158,7 +158,7 @@
     SC_M_MKWORKSPACE,
     SC_M_MKACTIVITY,
     SC_M_BASELINE_CONTROL,
-    SC_M_MERGE,           
+    SC_M_MERGE,
     0                       /* M_INVALID */
 };
 
@@ -218,7 +218,7 @@
     ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
                          "Into ajp_marshal_into_msgb");
 
-    if ((method = sc_for_req_method_by_id(r->method_number)) == UNKNOWN_METHOD) { 
+    if ((method = sc_for_req_method_by_id(r->method_number)) == UNKNOWN_METHOD) {
         ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
                "ajp_marshal_into_msgb - No such method %s",
                r->method);
@@ -274,7 +274,7 @@
                 return AJP_EOVERFLOW;
             }
         }
-        
+
         if (ajp_msg_append_string(msg, elts[i].val)) {
             ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
                    "ajp_marshal_into_msgb: "
@@ -297,7 +297,7 @@
         }
     }
  */
-        
+
     if (r->user) {
         if (ajp_msg_append_uint8(msg, SC_A_REMOTE_USER) ||
             ajp_msg_append_string(msg, r->user)) {
@@ -337,7 +337,7 @@
     }
 /* XXX: Is the subprocess_env a right place?
  * <Location /examples>
- *   ProxyPass ajp://remote:8009/servlets-examples 
+ *   ProxyPass ajp://remote:8009/servlets-examples
  *   SetEnv SSL_SESSION_ID CUSTOM_SSL_SESSION_ID
  * </Location>
  */
@@ -436,10 +436,10 @@
     *body_chunk
     terminator      boolean <! -- recycle connection or not  -->
 
-req_header_name := 
+req_header_name :=
     sc_req_header_name | (string)
 
-res_header_name := 
+res_header_name :=
     sc_res_header_name | (string)
 
 header_value :=
@@ -504,7 +504,7 @@
         if (rc != APR_SUCCESS) {
             return rc;
         }
-                
+
         if ((name & 0XFF00) == 0XA000) {
             ajp_msg_peek_uint16(msg, &name);
             stringname = long_res_header_for_sc(name);
@@ -555,7 +555,7 @@
         ap_xlate_proto_from_ascii(value, strlen(value));
 #endif
         ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
-               "ajp_unmarshal_response: Header[%d] [%s] = [%s]", 
+               "ajp_unmarshal_response: Header[%d] [%s] = [%s]",
                        i, stringname, value);
 
         apr_table_add(r->headers_out, stringname, value);
@@ -589,7 +589,7 @@
         return rc;
     }
 
-    rc = ajp_marshal_into_msgb(msg, r, uri);    
+    rc = ajp_marshal_into_msgb(msg, r, uri);
     if (rc != APR_SUCCESS) {
         ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
                "ajp_send_header: ajp_marshal_into_msgb failed");
@@ -615,7 +615,7 @@
 {
     apr_byte_t result;
     apr_status_t rc;
-   
+
     if (*msg) {
         rc = ajp_msg_reuse(*msg);
         if (rc != APR_SUCCESS) {

Modified: httpd/httpd/branches/2.2.x/modules/proxy/ajp_link.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/proxy/ajp_link.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/ajp_link.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/ajp_link.c Thu Nov 10 07:20:05 2005
@@ -28,9 +28,9 @@
                       "ajp_ilink_send(): NULL socket provided");
         return AJP_EINVAL;
     }
-    
+
     ajp_msg_end(msg);
-    
+
     length = msg->len;
     buf    = (char *)msg->buf;
 
@@ -68,7 +68,7 @@
             continue;
         else if (status != APR_SUCCESS)
             return status;          /* any error. */
-            
+
         rdlen += length;
         length = len - rdlen;
     }
@@ -89,15 +89,15 @@
     }
 
     hlen = msg->header_len;
-    
+
     status = ilink_read(sock, msg->buf, hlen);
-    
+
     if (status != APR_SUCCESS) {
         ap_log_error(APLOG_MARK, APLOG_ERR, status, NULL,
                      "ajp_ilink_receive() can't receive header");
         return AJP_ENO_HEADER;
     }
-    
+
     status = ajp_msg_check_header(msg, &blen);
 
     if (status != APR_SUCCESS) {

Modified: httpd/httpd/branches/2.2.x/modules/proxy/ajp_msg.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/proxy/ajp_msg.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/ajp_msg.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/ajp_msg.c Thu Nov 10 07:20:05 2005
@@ -42,7 +42,7 @@
         len = 1024;
     rv = apr_palloc(pool, bl);
     apr_snprintf(rv, bl,
-                 "ajp_msg_dump(): %s pos=%" APR_SIZE_T_FMT 
+                 "ajp_msg_dump(): %s pos=%" APR_SIZE_T_FMT
                  " len=%" APR_SIZE_T_FMT " max=%d\n",
                  err, msg->pos, msg->len, AJP_MSG_BUFFER_SZ);
     bl -= strlen(rv);
@@ -79,7 +79,7 @@
         p = rv + strlen(rv);
 
     }
-    
+
     return rv;
 }
 
@@ -120,7 +120,7 @@
     msg->len = msglen + AJP_HEADER_LEN;
     msg->pos = AJP_HEADER_LEN;
     *len     = msglen;
-    
+
     return APR_SUCCESS;
 }
 
@@ -134,7 +134,7 @@
 {
     msg->len = AJP_HEADER_LEN;
     msg->pos = AJP_HEADER_LEN;
-    
+
     return APR_SUCCESS;
 }
 
@@ -177,14 +177,14 @@
 
     msg->buf[2] = (apr_byte_t)((len >> 8) & 0xFF);
     msg->buf[3] = (apr_byte_t)(len & 0xFF);
-    
+
     return APR_SUCCESS;
 }
 
 static APR_INLINE int ajp_log_overflow(ajp_msg_t *msg, const char *context)
 {
     ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
-                 "%s(): BufferOverflowException %" APR_SIZE_T_FMT 
+                 "%s(): BufferOverflowException %" APR_SIZE_T_FMT
                  " %" APR_SIZE_T_FMT,
                  context, msg->pos, msg->len);
     return AJP_EOVERFLOW;
@@ -260,8 +260,8 @@
 }
 
 /**
- *  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
@@ -341,7 +341,7 @@
     value |= ((msg->buf[(msg->pos++)] & 0xFF) << 16);
     value |= ((msg->buf[(msg->pos++)] & 0xFF) << 8);
     value |= ((msg->buf[(msg->pos++)] & 0xFF));
-    
+
     *rvalue = value;
     return APR_SUCCESS;
 }
@@ -357,7 +357,7 @@
 apr_status_t ajp_msg_get_uint16(ajp_msg_t *msg, apr_uint16_t *rvalue)
 {
     apr_uint16_t value;
-    
+
     if ((msg->pos + 1) > msg->len) {
         return ajp_log_overflow(msg, "ajp_msg_get_uint16");
     }
@@ -384,10 +384,10 @@
     if ((msg->pos + 1) > msg->len) {
         return ajp_log_overflow(msg, "ajp_msg_peek_uint16");
     }
-    
+
     value = ((msg->buf[(msg->pos)] & 0xFF) << 8);
     value += ((msg->buf[(msg->pos + 1)] & 0xFF));
-    
+
     *rvalue = value;
     return APR_SUCCESS;
 }
@@ -405,7 +405,7 @@
     if (msg->pos > msg->len) {
         return ajp_log_overflow(msg, "ajp_msg_peek_uint8");
     }
-    
+
     *rvalue = msg->buf[msg->pos];
     return APR_SUCCESS;
 }
@@ -423,7 +423,7 @@
     if (msg->pos > msg->len) {
         return ajp_log_overflow(msg, "ajp_msg_get_uint8");
     }
-    
+
     *rvalue = msg->buf[msg->pos++];
     return APR_SUCCESS;
 }
@@ -441,7 +441,7 @@
     apr_uint16_t size;
     apr_size_t   start;
     apr_status_t status;
-       
+
     status = ajp_msg_get_uint16(msg, &size);
     start = msg->pos;
 
@@ -504,11 +504,11 @@
                       "ajp_msg_create(): can't allocate AJP message memory");
         return APR_ENOPOOL;
     }
-    
+
     msg->server_side = 0;
 
     msg->buf = (apr_byte_t *)apr_palloc(pool, AJP_MSG_BUFFER_SZ);
-    
+
     /* XXX: This should never happen
      * In case if the OS cannont allocate 8K of data
      * we are in serious trouble
@@ -524,7 +524,7 @@
     msg->len = 0;
     msg->header_len = AJP_HEADER_LEN;
     *rmsg = msg;
-    
+
     return APR_SUCCESS;
 }
 
@@ -542,7 +542,7 @@
                      "ajp_msg_copy(): destination msg is null");
         return AJP_EINVAL;
     }
-    
+
     if (smsg->len > AJP_MSG_BUFFER_SZ) {
         ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
                      "ajp_msg_copy(): destination buffer too "
@@ -576,11 +576,11 @@
 
     if ((rc = ajp_msg_append_uint8(msg, CMD_AJP13_PING)) != APR_SUCCESS)
         return rc;
-        
+
     return APR_SUCCESS;
 }
 
-/** 
+/**
  * Serialize in an AJP Message a CPING command
  *
  * +-----------------------+
@@ -597,6 +597,6 @@
 
     if ((rc = ajp_msg_append_uint8(msg, CMD_AJP13_CPING)) != APR_SUCCESS)
         return rc;
-        
+
     return APR_SUCCESS;
 }

Modified: httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy.c Thu Nov 10 07:20:05 2005
@@ -91,7 +91,7 @@
     }
     else if (!strcasecmp(key, "ttl")) {
         /* Time in seconds that will destroy all the connections
-         * that exced the smax 
+         * that exced the smax
          */
         ival = atoi(val);
         if (ival < 1)
@@ -166,7 +166,7 @@
         else
             return "KeepAlive must be On|Off";
         worker->keepalive_set = 1;
-    }    
+    }
     else if (!strcasecmp(key, "route")) {
         /* Worker route.
          */
@@ -189,35 +189,35 @@
         for (v = val; *v; v++) {
             if (*v == '+') {
                 mode = 1;
-                v++;    
+                v++;
             }
             else if (*v == '-') {
                 mode = 0;
-                v++;    
+                v++;
             }
             if (*v == 'D' || *v == 'd') {
                 if (mode)
                     worker->status |= PROXY_WORKER_DISABLED;
                 else
-                    worker->status &= ~PROXY_WORKER_DISABLED;                    
+                    worker->status &= ~PROXY_WORKER_DISABLED;
             }
             else if (*v == 'S' || *v == 's') {
                 if (mode)
                     worker->status |= PROXY_WORKER_STOPPED;
                 else
-                    worker->status &= ~PROXY_WORKER_STOPPED;                    
+                    worker->status &= ~PROXY_WORKER_STOPPED;
             }
             else if (*v == 'E' || *v == 'e') {
                 if (mode)
                     worker->status |= PROXY_WORKER_IN_ERROR;
                 else
-                    worker->status &= ~PROXY_WORKER_IN_ERROR;                    
+                    worker->status &= ~PROXY_WORKER_IN_ERROR;
             }
             else {
-                return "Unknow status parameter option";    
+                return "Unknow status parameter option";
             }
         }
-    }    
+    }
     else {
         return "unknown Worker parameter";
     }
@@ -364,7 +364,7 @@
         if (!(r->parsed_uri.hostname
               && !strcasecmp(r->parsed_uri.scheme, ap_http_scheme(r))
               && ap_matches_request_vhost(r, r->parsed_uri.hostname,
-                                          (apr_port_t)(r->parsed_uri.port_str ? r->parsed_uri.port 
+                                          (apr_port_t)(r->parsed_uri.port_str ? r->parsed_uri.port
                                                        : ap_default_port(r))))) {
             r->proxyreq = PROXYREQ_PROXY;
             r->uri = r->unparsed_uri;
@@ -432,25 +432,25 @@
     proxy_dir_conf *entry_proxy;
     int num_sec = sconf->sec_proxy->nelts;
     /* XXX: shouldn't we use URI here?  Canonicalize it first?
-     * Pass over "proxy:" prefix 
+     * Pass over "proxy:" prefix
      */
     const char *proxyname = r->filename + 6;
     int j;
 
-    for (j = 0; j < num_sec; ++j) 
+    for (j = 0; j < num_sec; ++j)
     {
         entry_config = sec_proxy[j];
         entry_proxy = ap_get_module_config(entry_config, &proxy_module);
 
         /* XXX: What about case insensitive matching ???
          * Compare regex, fnmatch or string as appropriate
-         * If the entry doesn't relate, then continue 
+         * If the entry doesn't relate, then continue
          */
-        if (entry_proxy->r 
+        if (entry_proxy->r
               ? ap_regexec(entry_proxy->r, proxyname, 0, NULL, 0)
               : (entry_proxy->p_is_fnmatch
                    ? apr_fnmatch(entry_proxy->p, proxyname, 0)
-                   : strncmp(proxyname, entry_proxy->p, 
+                   : strncmp(proxyname, entry_proxy->p,
                                         strlen(entry_proxy->p)))) {
             continue;
         }
@@ -608,14 +608,14 @@
         /* set configured max-forwards */
         maxfwd = conf->maxfwd;
     }
-    apr_table_set(r->headers_in, "Max-Forwards", 
+    apr_table_set(r->headers_in, "Max-Forwards",
                   apr_psprintf(r->pool, "%ld", (maxfwd > 0) ? maxfwd : 0));
 
     if (r->method_number == M_TRACE) {
         core_server_config *coreconf = (core_server_config *)
                             ap_get_module_config(sconf, &core_module);
 
-        if (coreconf->trace_enable == AP_TRACE_DISABLE) 
+        if (coreconf->trace_enable == AP_TRACE_DISABLE)
         {
             /* Allow "error-notes" string to be printed by ap_send_error_response()
              * Note; this goes nowhere, canned error response need an overhaul.
@@ -632,7 +632,7 @@
          * the client a 100 Continue response till the connection has
          * been established
          */
-        if (coreconf->trace_enable != AP_TRACE_EXTENDED 
+        if (coreconf->trace_enable != AP_TRACE_EXTENDED
             && (r->read_length || r->read_chunked || r->remaining))
         {
             /* Allow "error-notes" string to be printed by ap_send_error_response()
@@ -751,7 +751,7 @@
         }
         else if (access_status == HTTP_SERVICE_UNAVAILABLE) {
             /* Recoverable server error.
-             * We can failover to another worker 
+             * We can failover to another worker
              * Mark the worker as unusable if member of load balancer
              */
             if (balancer) {
@@ -767,7 +767,7 @@
         /* Try again if the worker is unusable and the service is
          * unavailable.
          */
-    } while (!PROXY_WORKER_IS_USABLE(worker) && 
+    } while (!PROXY_WORKER_IS_USABLE(worker) &&
              max_attempts > attempts++);
 
     if (DECLINED == access_status) {
@@ -821,16 +821,16 @@
     ps->io_buffer_size_set = 0;
     ps->maxfwd = DEFAULT_MAX_FORWARDS;
     ps->maxfwd_set = 0;
-    ps->error_override = 0; 
-    ps->error_override_set = 0; 
+    ps->error_override = 0;
+    ps->error_override_set = 0;
     ps->preserve_host_set = 0;
-    ps->preserve_host = 0;    
+    ps->preserve_host = 0;
     ps->timeout = 0;
     ps->timeout_set = 0;
     ps->badopt = bad_error;
     ps->badopt_set = 0;
     ps->pool = p;
-        
+
     return ps;
 }
 
@@ -993,7 +993,7 @@
     const apr_array_header_t *arr;
     const apr_table_entry_t *elts;
     int i;
-    
+
     while (*arg) {
         word = ap_getword_conf(cmd->pool, &arg);
         if (!f)
@@ -1007,7 +1007,7 @@
                     return "Invalid ProxyPass parameter.  Parameter must be "
                            "in the form 'key=value'";
                 else
-                    return "ProxyPass can not have a path when defined in a location"; 
+                    return "ProxyPass can not have a path when defined in a location";
             }
             else
                 *val++ = '\0';
@@ -1023,7 +1023,7 @@
     new->real = apr_pstrdup(cmd->pool, r);
     if (r[0] == '!' && r[1] == '\0')
         return NULL;
-    
+
     arr = apr_table_elts(params);
     elts = (const apr_table_entry_t *)arr->elts;
     /* Distinguish the balancer from woker */
@@ -1035,7 +1035,7 @@
                                                     conf, r);
             if (err)
                 return apr_pstrcat(cmd->temp_pool, "ProxyPass ", err, NULL);
-        }        
+        }
         for (i = 0; i < arr->nelts; i++) {
             const char *err = set_balancer_param(conf, cmd->pool, balancer, elts[i].key,
                                                  elts[i].val);
@@ -1079,7 +1079,7 @@
     } else {
         if ( r == NULL)
             return "ProxyPassReverse needs a path when not defined in a location";
-        else 
+        else
             return "ProxyPassReverse can not have a path when defined in a location";
     }
 
@@ -1325,7 +1325,7 @@
     psf->timeout_set=1;
     psf->timeout=apr_time_from_sec(timeout);
 
-    return NULL;    
+    return NULL;
 }
 
 static const char*
@@ -1348,7 +1348,7 @@
     }
 
     psf->viaopt_set = 1;
-    return NULL;    
+    return NULL;
 }
 
 static const char*
@@ -1369,7 +1369,7 @@
     }
 
     psf->badopt_set = 1;
-    return NULL;    
+    return NULL;
 }
 
 static const char*
@@ -1390,7 +1390,7 @@
     }
 
     psf->proxy_status_set = 1;
-    return NULL;    
+    return NULL;
 }
 
 static const char *add_member(cmd_parms *cmd, void *dummy, const char *arg)
@@ -1407,7 +1407,7 @@
     const apr_array_header_t *arr;
     const apr_table_entry_t *elts;
     int i;
-    
+
     if (cmd->path)
         path = apr_pstrdup(cmd->pool, cmd->path);
     while (*arg) {
@@ -1433,7 +1433,7 @@
         return "BalancerMember must define balancer name when outside <Proxy > section";
     if (!name)
         return "BalancerMember must define remote proxy server";
-    
+
     ap_str_tolower(path);   /* lowercase scheme://hostname */
 
     /* Try to find existing worker */
@@ -1441,10 +1441,10 @@
     if (!worker) {
         const char *err;
         if ((err = ap_proxy_add_worker(&worker, cmd->pool, conf, name)) != NULL)
-            return apr_pstrcat(cmd->temp_pool, "BalancerMember ", err, NULL); 
+            return apr_pstrcat(cmd->temp_pool, "BalancerMember ", err, NULL);
     }
     PROXY_COPY_CONF_PARAMS(worker, conf);
-    
+
     arr = apr_table_elts(params);
     elts = (const apr_table_entry_t *)arr->elts;
     for (i = 0; i < arr->nelts; i++) {
@@ -1454,7 +1454,7 @@
             return apr_pstrcat(cmd->temp_pool, "BalancerMember ", err, NULL);
     }
     /* Try to find the balancer */
-    balancer = ap_proxy_get_balancer(cmd->temp_pool, conf, path); 
+    balancer = ap_proxy_get_balancer(cmd->temp_pool, conf, path);
     if (!balancer) {
         const char *err = ap_proxy_add_balancer(&balancer,
                                                 cmd->pool,
@@ -1496,13 +1496,13 @@
          */
         name = ap_getword_conf(cmd->temp_pool, &arg);
     }
- 
+
     if (strncasecmp(name, "balancer:", 9) == 0) {
         balancer = ap_proxy_get_balancer(cmd->pool, conf, name);
         if (!balancer) {
             return apr_pstrcat(cmd->temp_pool, "ProxySet can not find '",
                                name, "' Balancer.", NULL);
-        }        
+        }
     }
     else {
         worker = ap_proxy_get_worker(cmd->temp_pool, conf, name);
@@ -1538,7 +1538,7 @@
     proxy_server_conf *sconf = ap_get_module_config(s->module_config,
                                                     &proxy_module);
     void **new_space = (void **)apr_array_push(sconf->sec_proxy);
-    
+
     *new_space = dir_config;
 }
 
@@ -1579,7 +1579,7 @@
     if (!strncasecmp(cmd->path, "proxy:", 6))
         cmd->path += 6;
 
-    /* XXX Ignore case?  What if we proxy a case-insensitive server?!? 
+    /* XXX Ignore case?  What if we proxy a case-insensitive server?!?
      * While we are at it, shouldn't we also canonicalize the entire
      * scheme?  See proxy_fixup()
      */
@@ -1628,7 +1628,7 @@
 
 static const command_rec proxy_cmds[] =
 {
-    AP_INIT_RAW_ARGS("<Proxy", proxysection, NULL, RSRC_CONF, 
+    AP_INIT_RAW_ARGS("<Proxy", proxysection, NULL, RSRC_CONF,
     "Container for directives affecting resources located in the proxied "
     "location"),
     AP_INIT_RAW_ARGS("<ProxyMatch", proxysection, (void*)1, RSRC_CONF,
@@ -1674,7 +1674,7 @@
     AP_INIT_TAKE1("ProxyBadHeader", set_bad_opt, NULL, RSRC_CONF,
      "How to handle bad header line in response: IsError | Ignore | StartBody"),
     AP_INIT_RAW_ARGS("BalancerMember", add_member, NULL, RSRC_CONF|ACCESS_CONF,
-     "A balancer name and scheme with list of params"), 
+     "A balancer name and scheme with list of params"),
     AP_INIT_TAKE1("ProxyStatus", set_status_opt, NULL, RSRC_CONF,
      "Configure Status: proxy status to one of: on | off | full"),
     AP_INIT_RAW_ARGS("ProxySet", set_proxy_param, NULL, RSRC_CONF|ACCESS_CONF,
@@ -1689,7 +1689,7 @@
 
 PROXY_DECLARE(int) ap_proxy_ssl_enable(conn_rec *c)
 {
-    /* 
+    /*
      * if c == NULL just check if the optional function was imported
      * else run the optional function so ssl filters are inserted
      */
@@ -1764,7 +1764,7 @@
         ap_rvputs(r, balancer->name, "</h1>\n\n", NULL);
         ap_rputs("\n\n<table border=\"0\"><tr>"
                  "<th>SSes</th><th>Timeout</th><th>Method</th>"
-                 "</tr>\n<tr>", r);                
+                 "</tr>\n<tr>", r);
         ap_rvputs(r, "<td>", balancer->sticky, NULL);
         ap_rprintf(r, "</td><td>%" APR_TIME_T_FMT "</td>",
                    apr_time_sec(balancer->timeout));
@@ -1827,7 +1827,7 @@
 static void child_init(apr_pool_t *p, server_rec *s)
 {
     proxy_worker *reverse = NULL;
-    
+
     while (s) {
         void *sconf = s->module_config;
         proxy_server_conf *conf;
@@ -1835,7 +1835,7 @@
         int i;
 
         conf = (proxy_server_conf *)ap_get_module_config(sconf, &proxy_module);
-        /* Initialize worker's shared scoreboard data */ 
+        /* Initialize worker's shared scoreboard data */
         worker = (proxy_worker *)conf->workers->elts;
         for (i = 0; i < conf->workers->nelts; i++) {
             ap_proxy_initialize_worker_share(conf, worker, s);
@@ -1848,7 +1848,7 @@
             ap_proxy_initialize_worker(conf->forward, s);
             /* Do not disable worker in case of errors */
             conf->forward->s->status |= PROXY_WORKER_IGNORE_ERRORS;
-            /* Disable address cache for generic forward worker */ 
+            /* Disable address cache for generic forward worker */
             conf->forward->is_address_reusable = 0;
         }
         if (!reverse) {
@@ -1860,7 +1860,7 @@
             ap_proxy_initialize_worker(reverse, s);
             /* Do not disable worker in case of errors */
             reverse->s->status |= PROXY_WORKER_IGNORE_ERRORS;
-            /* Disable address cache for generic reverse worker */ 
+            /* Disable address cache for generic reverse worker */
             reverse->is_address_reusable = 0;
         }
         conf->reverse = reverse;
@@ -1877,7 +1877,7 @@
 {
     APR_OPTIONAL_HOOK(ap, status_hook, proxy_status_hook, NULL, NULL,
                       APR_HOOK_MIDDLE);
-    /* Reset workers count on gracefull restart */ 
+    /* Reset workers count on gracefull restart */
     proxy_lb_workers = 0;
     return OK;
 }
@@ -1893,7 +1893,7 @@
      * initializes.
      */
     static const char *const aszPred[] = { "mpm_winnt.c", NULL};
-    
+
     APR_REGISTER_OPTIONAL_FN(ap_proxy_lb_workers);
     /* handler */
     ap_hook_handler(proxy_handler, NULL, NULL, APR_HOOK_FIRST);
@@ -1906,11 +1906,11 @@
     /* post read_request handling */
     ap_hook_post_read_request(proxy_detect, NULL, NULL, APR_HOOK_FIRST);
     /* pre config handling */
-    ap_hook_pre_config(proxy_pre_config, NULL, NULL, APR_HOOK_MIDDLE); 
+    ap_hook_pre_config(proxy_pre_config, NULL, NULL, APR_HOOK_MIDDLE);
     /* post config handling */
     ap_hook_post_config(proxy_post_config, NULL, NULL, APR_HOOK_MIDDLE);
     /* child init handling */
-    ap_hook_child_init(child_init, aszPred, NULL, APR_HOOK_MIDDLE); 
+    ap_hook_child_init(child_init, aszPred, NULL, APR_HOOK_MIDDLE);
 
 }
 
@@ -1933,19 +1933,19 @@
     APR_HOOK_LINK(request_status)
 )
 
-APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(proxy, PROXY, int, scheme_handler, 
+APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(proxy, PROXY, int, scheme_handler,
                                      (request_rec *r, proxy_worker *worker,
-                                      proxy_server_conf *conf, 
-                                      char *url, const char *proxyhost, 
+                                      proxy_server_conf *conf,
+                                      char *url, const char *proxyhost,
                                       apr_port_t proxyport),(r,worker,conf,
                                       url,proxyhost,proxyport),DECLINED)
-APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(proxy, PROXY, int, canon_handler, 
+APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(proxy, PROXY, int, canon_handler,
                                       (request_rec *r, char *url),(r,
                                       url),DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(proxy, PROXY, int, pre_request, (
                                       proxy_worker **worker,
                                       proxy_balancer **balancer,
-                                      request_rec *r, 
+                                      request_rec *r,
                                       proxy_server_conf *conf,
                                       char **url),(worker,balancer,
                                       r,conf,url),DECLINED)
@@ -1959,6 +1959,6 @@
                                     (request_rec *r), (r),
                                     OK, DECLINED)
 APR_IMPLEMENT_OPTIONAL_HOOK_RUN_ALL(proxy, PROXY, int, request_status,
-                                    (int *status, request_rec *r), 
+                                    (int *status, request_rec *r),
                                     (status, r),
                                     OK, DECLINED)

Modified: httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_ajp.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_ajp.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_ajp.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_ajp.c Thu Nov 10 07:20:05 2005
@@ -198,7 +198,7 @@
 
         /* Try to send something */
         ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
-                     "proxy: data to read (max %" APR_SIZE_T_FMT 
+                     "proxy: data to read (max %" APR_SIZE_T_FMT
                      " at %" APR_SIZE_T_FMT ")", bufsiz, msg->pos);
 
         status = apr_brigade_flatten(input_brigade, buff, &bufsiz);



Mime
View raw message