httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r332306 [1/14] - in /httpd/httpd/trunk: 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/ modules/ge...
Date Thu, 10 Nov 2005 15:13:26 GMT
Author: jim
Date: Thu Nov 10 07:11:44 2005
New Revision: 332306

URL: http://svn.apache.org/viewcvs?rev=332306&view=rev
Log:
No functional Change: Removing trailing whitespace. This also
means that "blank" lines consisting of just spaces or
tabs are now really blank lines

Modified:
    httpd/httpd/trunk/modules/aaa/mod_auth_basic.c
    httpd/httpd/trunk/modules/aaa/mod_auth_digest.c
    httpd/httpd/trunk/modules/aaa/mod_authn_alias.c
    httpd/httpd/trunk/modules/aaa/mod_authn_anon.c
    httpd/httpd/trunk/modules/aaa/mod_authn_dbd.c
    httpd/httpd/trunk/modules/aaa/mod_authn_dbm.c
    httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c
    httpd/httpd/trunk/modules/aaa/mod_authz_dbm.c
    httpd/httpd/trunk/modules/aaa/mod_authz_default.c
    httpd/httpd/trunk/modules/aaa/mod_authz_groupfile.c
    httpd/httpd/trunk/modules/aaa/mod_authz_host.c
    httpd/httpd/trunk/modules/aaa/mod_authz_owner.c
    httpd/httpd/trunk/modules/aaa/mod_authz_user.c
    httpd/httpd/trunk/modules/arch/netware/libprews.c
    httpd/httpd/trunk/modules/arch/netware/mod_netware.c
    httpd/httpd/trunk/modules/arch/netware/mod_nw_ssl.c
    httpd/httpd/trunk/modules/arch/win32/mod_isapi.c
    httpd/httpd/trunk/modules/arch/win32/mod_win32.c
    httpd/httpd/trunk/modules/cache/cache_hash.c
    httpd/httpd/trunk/modules/cache/cache_storage.c
    httpd/httpd/trunk/modules/cache/cache_util.c
    httpd/httpd/trunk/modules/cache/mod_cache.c
    httpd/httpd/trunk/modules/cache/mod_disk_cache.c
    httpd/httpd/trunk/modules/cache/mod_file_cache.c
    httpd/httpd/trunk/modules/cache/mod_mem_cache.c
    httpd/httpd/trunk/modules/dav/fs/dbm.c
    httpd/httpd/trunk/modules/dav/fs/lock.c
    httpd/httpd/trunk/modules/dav/fs/repos.c
    httpd/httpd/trunk/modules/dav/lock/locks.c
    httpd/httpd/trunk/modules/dav/main/liveprop.c
    httpd/httpd/trunk/modules/dav/main/mod_dav.c
    httpd/httpd/trunk/modules/dav/main/util.c
    httpd/httpd/trunk/modules/dav/main/util_lock.c
    httpd/httpd/trunk/modules/debug/mod_bucketeer.c
    httpd/httpd/trunk/modules/debug/mod_dumpio.c
    httpd/httpd/trunk/modules/echo/mod_echo.c
    httpd/httpd/trunk/modules/experimental/mod_case_filter.c
    httpd/httpd/trunk/modules/experimental/mod_case_filter_in.c
    httpd/httpd/trunk/modules/experimental/mod_example.c
    httpd/httpd/trunk/modules/filters/mod_charset_lite.c
    httpd/httpd/trunk/modules/filters/mod_deflate.c
    httpd/httpd/trunk/modules/filters/mod_ext_filter.c
    httpd/httpd/trunk/modules/filters/mod_filter.c
    httpd/httpd/trunk/modules/filters/mod_include.c
    httpd/httpd/trunk/modules/generators/mod_asis.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_info.c
    httpd/httpd/trunk/modules/generators/mod_status.c
    httpd/httpd/trunk/modules/http/byterange_filter.c
    httpd/httpd/trunk/modules/http/chunk_filter.c
    httpd/httpd/trunk/modules/http/http_core.c
    httpd/httpd/trunk/modules/http/http_etag.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/http/mod_mime.c
    httpd/httpd/trunk/modules/ldap/util_ldap.c
    httpd/httpd/trunk/modules/ldap/util_ldap_cache.c
    httpd/httpd/trunk/modules/ldap/util_ldap_cache_mgr.c
    httpd/httpd/trunk/modules/loggers/mod_log_config.c
    httpd/httpd/trunk/modules/loggers/mod_log_forensic.c
    httpd/httpd/trunk/modules/loggers/mod_logio.c
    httpd/httpd/trunk/modules/mappers/mod_actions.c
    httpd/httpd/trunk/modules/mappers/mod_alias.c
    httpd/httpd/trunk/modules/mappers/mod_dir.c
    httpd/httpd/trunk/modules/mappers/mod_imagemap.c
    httpd/httpd/trunk/modules/mappers/mod_negotiation.c
    httpd/httpd/trunk/modules/mappers/mod_rewrite.c
    httpd/httpd/trunk/modules/mappers/mod_so.c
    httpd/httpd/trunk/modules/mappers/mod_speling.c
    httpd/httpd/trunk/modules/mappers/mod_userdir.c
    httpd/httpd/trunk/modules/mappers/mod_vhost_alias.c
    httpd/httpd/trunk/modules/metadata/mod_cern_meta.c
    httpd/httpd/trunk/modules/metadata/mod_env.c
    httpd/httpd/trunk/modules/metadata/mod_expires.c
    httpd/httpd/trunk/modules/metadata/mod_headers.c
    httpd/httpd/trunk/modules/metadata/mod_mime_magic.c
    httpd/httpd/trunk/modules/metadata/mod_setenvif.c
    httpd/httpd/trunk/modules/metadata/mod_unique_id.c
    httpd/httpd/trunk/modules/metadata/mod_usertrack.c
    httpd/httpd/trunk/modules/metadata/mod_version.c
    httpd/httpd/trunk/modules/proxy/ajp_header.c
    httpd/httpd/trunk/modules/proxy/ajp_link.c
    httpd/httpd/trunk/modules/proxy/ajp_msg.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_ftp.c
    httpd/httpd/trunk/modules/proxy/mod_proxy_http.c
    httpd/httpd/trunk/modules/proxy/proxy_util.c
    httpd/httpd/trunk/modules/ssl/mod_ssl.c
    httpd/httpd/trunk/modules/ssl/ssl_engine_config.c
    httpd/httpd/trunk/modules/ssl/ssl_engine_dh.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_mutex.c
    httpd/httpd/trunk/modules/ssl/ssl_engine_pphrase.c
    httpd/httpd/trunk/modules/ssl/ssl_engine_rand.c
    httpd/httpd/trunk/modules/ssl/ssl_engine_vars.c
    httpd/httpd/trunk/modules/ssl/ssl_expr_eval.c
    httpd/httpd/trunk/modules/ssl/ssl_expr_parse.c
    httpd/httpd/trunk/modules/ssl/ssl_expr_scan.c
    httpd/httpd/trunk/modules/ssl/ssl_scache.c
    httpd/httpd/trunk/modules/ssl/ssl_scache_dbm.c
    httpd/httpd/trunk/modules/ssl/ssl_scache_dc.c
    httpd/httpd/trunk/modules/ssl/ssl_scache_shmcb.c
    httpd/httpd/trunk/modules/ssl/ssl_util.c
    httpd/httpd/trunk/modules/ssl/ssl_util_ssl.c
    httpd/httpd/trunk/os/beos/beosd.c
    httpd/httpd/trunk/os/beos/os.c
    httpd/httpd/trunk/os/bs2000/ebcdic.c
    httpd/httpd/trunk/os/tpf/ebcdic.c
    httpd/httpd/trunk/os/tpf/os.c
    httpd/httpd/trunk/os/unix/unixd.c
    httpd/httpd/trunk/os/win32/ap_regkey.c
    httpd/httpd/trunk/os/win32/util_win32.c
    httpd/httpd/trunk/server/config.c
    httpd/httpd/trunk/server/connection.c
    httpd/httpd/trunk/server/core.c
    httpd/httpd/trunk/server/core_filters.c
    httpd/httpd/trunk/server/eoc_bucket.c
    httpd/httpd/trunk/server/eor_bucket.c
    httpd/httpd/trunk/server/gen_test_char.c
    httpd/httpd/trunk/server/listen.c
    httpd/httpd/trunk/server/log.c
    httpd/httpd/trunk/server/main.c
    httpd/httpd/trunk/server/mpm/beos/beos.c
    httpd/httpd/trunk/server/mpm/experimental/event/event.c
    httpd/httpd/trunk/server/mpm/experimental/event/fdqueue.c
    httpd/httpd/trunk/server/mpm/experimental/leader/leader.c
    httpd/httpd/trunk/server/mpm/experimental/perchild/perchild.c
    httpd/httpd/trunk/server/mpm/experimental/threadpool/pod.c
    httpd/httpd/trunk/server/mpm/experimental/threadpool/threadpool.c
    httpd/httpd/trunk/server/mpm/mpmt_os2/mpmt_os2.c
    httpd/httpd/trunk/server/mpm/mpmt_os2/mpmt_os2_child.c
    httpd/httpd/trunk/server/mpm/netware/mpm_netware.c
    httpd/httpd/trunk/server/mpm/prefork/prefork.c
    httpd/httpd/trunk/server/mpm/winnt/Win9xConHook.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/fdqueue.c
    httpd/httpd/trunk/server/mpm/worker/pod.c
    httpd/httpd/trunk/server/mpm/worker/worker.c
    httpd/httpd/trunk/server/mpm_common.c
    httpd/httpd/trunk/server/protocol.c
    httpd/httpd/trunk/server/provider.c
    httpd/httpd/trunk/server/request.c
    httpd/httpd/trunk/server/scoreboard.c
    httpd/httpd/trunk/server/util.c
    httpd/httpd/trunk/server/util_cfgtree.c
    httpd/httpd/trunk/server/util_charset.c
    httpd/httpd/trunk/server/util_ebcdic.c
    httpd/httpd/trunk/server/util_filter.c
    httpd/httpd/trunk/server/util_md5.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/htdbm.c
    httpd/httpd/trunk/support/htdigest.c
    httpd/httpd/trunk/support/htpasswd.c
    httpd/httpd/trunk/support/httxt2dbm.c
    httpd/httpd/trunk/support/logresolve.c
    httpd/httpd/trunk/support/rotatelogs.c
    httpd/httpd/trunk/support/suexec.c
    httpd/httpd/trunk/support/win32/ApacheMonitor.c
    httpd/httpd/trunk/support/win32/wintty.c
    httpd/httpd/trunk/test/cls.c
    httpd/httpd/trunk/test/test_find.c
    httpd/httpd/trunk/test/test_limits.c
    httpd/httpd/trunk/test/test_parser.c
    httpd/httpd/trunk/test/time-sem.c
    httpd/httpd/trunk/test/zb.c

Modified: httpd/httpd/trunk/modules/aaa/mod_auth_basic.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/aaa/mod_auth_basic.c?rev=332306&r1=332305&r2=332306&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_auth_basic.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_auth_basic.c Thu Nov 10 07:11:44 2005
@@ -256,7 +256,7 @@
 
         current_provider = current_provider->next;
     } while (current_provider);
-    
+
     if (auth_result != AUTH_GRANTED) {
         int return_code;
 
@@ -280,7 +280,7 @@
             break;
         case AUTH_GENERAL_ERROR:
         default:
-            /* We'll assume that the module has already said what its error 
+            /* We'll assume that the module has already said what its error
              * was in the logs.
              */
             return_code = HTTP_INTERNAL_SERVER_ERROR;

Modified: httpd/httpd/trunk/modules/aaa/mod_auth_digest.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/aaa/mod_auth_digest.c?rev=332306&r1=332305&r2=332306&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_auth_digest.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_auth_digest.c Thu Nov 10 07:11:44 2005
@@ -51,7 +51,7 @@
  *       The only problem is that it allows replay attacks when somebody
  *       captures a packet sent to one server and sends it to another
  *       one. Should we add "AuthDigestNcCheck Strict"?
- *   - expired nonces give amaya fits.  
+ *   - expired nonces give amaya fits.
  */
 
 #include "apr_sha1.h"
@@ -80,8 +80,8 @@
 
 #include "mod_auth.h"
 
-/* Disable shmem until pools/init gets sorted out 
- * remove following two lines when fixed 
+/* Disable shmem until pools/init gets sorted out
+ * remove following two lines when fixed
  */
 #undef APR_HAS_SHARED_MEMORY
 #define APR_HAS_SHARED_MEMORY 0
@@ -200,7 +200,7 @@
 
 static apr_status_t cleanup_tables(void *not_used)
 {
-    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, 
+    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
                   "Digest: cleaning up shared memory");
     fflush(stderr);
 
@@ -238,7 +238,7 @@
     if (status != APR_SUCCESS) {
         char buf[120];
         ap_log_error(APLOG_MARK, APLOG_CRIT, status, s,
-                     "Digest: error generating secret: %s", 
+                     "Digest: error generating secret: %s",
                      apr_strerror(status, buf, sizeof(buf)));
         return status;
     }
@@ -447,13 +447,13 @@
     digest_config_rec *conf = (digest_config_rec*)config;
     authn_provider_list *newp;
     const char *provider_name;
-    
+
     if (strcasecmp(arg, "on") == 0) {
         provider_name = AUTHN_DEFAULT_PROVIDER;
     }
     else if (strcasecmp(arg, "off") == 0) {
         /* Clear all configured providers and return. */
-        conf->providers = NULL; 
+        conf->providers = NULL;
         return NULL;
     }
     else {
@@ -540,7 +540,7 @@
     char *endptr;
     long  lifetime;
 
-    lifetime = strtol(t, &endptr, 10); 
+    lifetime = strtol(t, &endptr, 10);
     if (endptr < (t+strlen(t)) && !apr_isspace(*endptr)) {
         return apr_pstrcat(cmd->pool,
                            "Invalid time in AuthDigestNonceLifetime: ",
@@ -608,7 +608,7 @@
     char *endptr;
     long  size, min;
 
-    size = strtol(size_str, &endptr, 10); 
+    size = strtol(size_str, &endptr, 10);
     while (apr_isspace(*endptr)) endptr++;
     if (*endptr == '\0' || *endptr == 'b' || *endptr == 'B') {
         ;
@@ -645,23 +645,23 @@
 
 static const command_rec digest_cmds[] =
 {
-    AP_INIT_TAKE1("AuthName", set_realm, NULL, OR_AUTHCFG, 
+    AP_INIT_TAKE1("AuthName", set_realm, NULL, OR_AUTHCFG,
      "The authentication realm (e.g. \"Members Only\")"),
     AP_INIT_ITERATE("AuthDigestProvider", add_authn_provider, NULL, OR_AUTHCFG,
                      "specify the auth providers for a directory or location"),
-    AP_INIT_ITERATE("AuthDigestQop", set_qop, NULL, OR_AUTHCFG, 
+    AP_INIT_ITERATE("AuthDigestQop", set_qop, NULL, OR_AUTHCFG,
      "A list of quality-of-protection options"),
-    AP_INIT_TAKE1("AuthDigestNonceLifetime", set_nonce_lifetime, NULL, OR_AUTHCFG, 
+    AP_INIT_TAKE1("AuthDigestNonceLifetime", set_nonce_lifetime, NULL, OR_AUTHCFG,
      "Maximum lifetime of the server nonce (seconds)"),
-    AP_INIT_TAKE1("AuthDigestNonceFormat", set_nonce_format, NULL, OR_AUTHCFG, 
+    AP_INIT_TAKE1("AuthDigestNonceFormat", set_nonce_format, NULL, OR_AUTHCFG,
      "The format to use when generating the server nonce"),
-    AP_INIT_FLAG("AuthDigestNcCheck", set_nc_check, NULL, OR_AUTHCFG, 
+    AP_INIT_FLAG("AuthDigestNcCheck", set_nc_check, NULL, OR_AUTHCFG,
      "Whether or not to check the nonce-count sent by the client"),
-    AP_INIT_TAKE1("AuthDigestAlgorithm", set_algorithm, NULL, OR_AUTHCFG, 
+    AP_INIT_TAKE1("AuthDigestAlgorithm", set_algorithm, NULL, OR_AUTHCFG,
      "The algorithm used for the hash calculation"),
-    AP_INIT_ITERATE("AuthDigestDomain", set_uri_list, NULL, OR_AUTHCFG, 
+    AP_INIT_ITERATE("AuthDigestDomain", set_uri_list, NULL, OR_AUTHCFG,
      "A list of URI's which belong to the same protection space as the current URI"),
-    AP_INIT_TAKE1("AuthDigestShmemSize", set_shmem_size, NULL, RSRC_CONF, 
+    AP_INIT_TAKE1("AuthDigestShmemSize", set_shmem_size, NULL, RSRC_CONF,
      "The amount of shared memory to allocate for keeping track of clients"),
     {NULL}
 };
@@ -1300,13 +1300,13 @@
      * unneccessarily (it's usually > 200 bytes!).
      */
 
-    
+
     /* don't send domain
      * - for proxy requests
      * - if it's no specified
      */
     if (r->proxyreq || !conf->uri_list) {
-        domain = NULL;  
+        domain = NULL;
     }
     else {
         domain = conf->uri_list;
@@ -1464,7 +1464,7 @@
         if (dt > conf->nonce_lifetime) {
             ap_log_rerror(APLOG_MARK, APLOG_INFO, 0,r,
                           "Digest: user %s: nonce expired (%.2f seconds old "
-                          "- max lifetime %.2f) - sending new nonce", 
+                          "- max lifetime %.2f) - sending new nonce",
                           r->user, (double)apr_time_sec(dt),
                           (double)apr_time_sec(conf->nonce_lifetime));
             note_digest_auth_failure(r, conf, resp, 1);
@@ -1536,7 +1536,7 @@
 }
 
 
-static void copy_uri_components(apr_uri_t *dst, 
+static void copy_uri_components(apr_uri_t *dst,
                                 apr_uri_t *src, request_rec *r) {
     if (src->scheme && src->scheme[0] != '\0') {
         dst->scheme = src->scheme;
@@ -1684,30 +1684,30 @@
             ap_unescape_url(d_uri.query);
         }
         else if (r_uri.query) {
-            /* MSIE compatibility hack.  MSIE has some RFC issues - doesn't 
+            /* MSIE compatibility hack.  MSIE has some RFC issues - doesn't
              * include the query string in the uri Authorization component
              * or when computing the response component.  the second part
              * works out ok, since we can hash the header and get the same
              * result.  however, the uri from the request line won't match
-             * the uri Authorization component since the header lacks the 
+             * the uri Authorization component since the header lacks the
              * query string, leaving us incompatable with a (broken) MSIE.
-             * 
+             *
              * the workaround is to fake a query string match if in the proper
              * environment - BrowserMatch MSIE, for example.  the cool thing
-             * is that if MSIE ever fixes itself the simple match ought to 
+             * is that if MSIE ever fixes itself the simple match ought to
              * work and this code won't be reached anyway, even if the
              * environment is set.
              */
 
-            if (apr_table_get(r->subprocess_env, 
+            if (apr_table_get(r->subprocess_env,
                               "AuthDigestEnableQueryStringHack")) {
-            
+
                 ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, "Digest: "
                               "applying AuthDigestEnableQueryStringHack "
                               "to uri <%s>", resp->raw_request_uri);
 
                d_uri.query = r_uri.query;
-            } 
+            }
         }
 
         if (r->method_number == M_CONNECT) {
@@ -1800,7 +1800,7 @@
          */
         return HTTP_INTERNAL_SERVER_ERROR;
     }
-    
+
     if (resp->message_qop == NULL) {
         /* old (rfc-2069) style digest */
         if (strcmp(resp->digest, old_digest(r, resp, conf->ha1))) {

Modified: httpd/httpd/trunk/modules/aaa/mod_authn_alias.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/aaa/mod_authn_alias.c?rev=332306&r1=332305&r2=332306&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authn_alias.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authn_alias.c Thu Nov 10 07:11:44 2005
@@ -51,19 +51,19 @@
 
     const char *provider_name = apr_table_get(r->notes, AUTHN_PROVIDER_NAME_NOTE);
     authn_status ret = AUTH_USER_NOT_FOUND;
-    authn_alias_srv_conf *authcfg = 
-        (authn_alias_srv_conf *)ap_get_module_config(r->server->module_config, 
+    authn_alias_srv_conf *authcfg =
+        (authn_alias_srv_conf *)ap_get_module_config(r->server->module_config,
                                                      &authn_alias_module);
 
     if (provider_name) {
-        provider_alias_rec *prvdraliasrec = apr_hash_get(authcfg->alias_rec, 
+        provider_alias_rec *prvdraliasrec = apr_hash_get(authcfg->alias_rec,
                                                          provider_name, APR_HASH_KEY_STRING);
         ap_conf_vector_t *orig_dir_config = r->per_dir_config;
 
-        /* If we found the alias provider in the list, then merge the directory 
+        /* If we found the alias provider in the list, then merge the directory
            configurations and call the real provider */
         if (prvdraliasrec) {
-            r->per_dir_config = ap_merge_per_dir_configs(r->pool, orig_dir_config, 
+            r->per_dir_config = ap_merge_per_dir_configs(r->pool, orig_dir_config,
                                                          prvdraliasrec->sec_auth);
             ret = prvdraliasrec->provider->check_password(r,user,password);
             r->per_dir_config = orig_dir_config;
@@ -83,19 +83,19 @@
 
     const char *provider_name = apr_table_get(r->notes, AUTHN_PROVIDER_NAME_NOTE);
     authn_status ret = AUTH_USER_NOT_FOUND;
-    authn_alias_srv_conf *authcfg = 
-        (authn_alias_srv_conf *)ap_get_module_config(r->server->module_config, 
+    authn_alias_srv_conf *authcfg =
+        (authn_alias_srv_conf *)ap_get_module_config(r->server->module_config,
                                                      &authn_alias_module);
 
     if (provider_name) {
-        provider_alias_rec *prvdraliasrec = apr_hash_get(authcfg->alias_rec, 
+        provider_alias_rec *prvdraliasrec = apr_hash_get(authcfg->alias_rec,
                                                          provider_name, APR_HASH_KEY_STRING);
         ap_conf_vector_t *orig_dir_config = r->per_dir_config;
 
-        /* If we found the alias provider in the list, then merge the directory 
+        /* If we found the alias provider in the list, then merge the directory
            configurations and call the real provider */
         if (prvdraliasrec) {
-            r->per_dir_config = ap_merge_per_dir_configs(r->pool, orig_dir_config, 
+            r->per_dir_config = ap_merge_per_dir_configs(r->pool, orig_dir_config,
                                                          prvdraliasrec->sec_auth);
             ret = prvdraliasrec->provider->get_realm_hash(r,user,realm,rethash);
             r->per_dir_config = orig_dir_config;
@@ -131,8 +131,8 @@
     char *provider_name;
     const char *errmsg;
     ap_conf_vector_t *new_auth_config = ap_create_per_dir_config(cmd->pool);
-    authn_alias_srv_conf *authcfg = 
-        (authn_alias_srv_conf *)ap_get_module_config(cmd->server->module_config, 
+    authn_alias_srv_conf *authcfg =
+        (authn_alias_srv_conf *)ap_get_module_config(cmd->server->module_config,
                                                      &authn_alias_module);
 
     const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
@@ -170,7 +170,7 @@
         provider_alias_rec *prvdraliasrec = apr_pcalloc(cmd->pool, sizeof(provider_alias_rec));
         const authn_provider *provider = ap_lookup_provider(AUTHN_PROVIDER_GROUP, provider_name,"0");
 
-        /* Save off the new directory config along with the original provider name 
+        /* Save off the new directory config along with the original provider name
            and function pointer data */
         prvdraliasrec->sec_auth = new_auth_config;
         prvdraliasrec->provider_name = provider_name;

Modified: httpd/httpd/trunk/modules/aaa/mod_authn_anon.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/aaa/mod_authn_anon.c?rev=332306&r1=332305&r2=332306&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authn_anon.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authn_anon.c Thu Nov 10 07:11:44 2005
@@ -20,7 +20,7 @@
  * as the password.
  *
  * Just add the following tokes to your <directory> setup:
- * 
+ *
  * Anonymous                    magic-userid [magic-userid]...
  *
  * Anonymous_MustGiveEmail      [ on | off ] default = on
@@ -28,8 +28,8 @@
  * Anonymous_VerifyEmail        [ on | off ] default = off
  * Anonymous_NoUserId           [ on | off ] default = off
  *
- * The magic user id is something like 'anonymous', it is NOT case sensitive. 
- * 
+ * The magic user id is something like 'anonymous', it is NOT case sensitive.
+ *
  * The MustGiveEmail flag can be used to force users to enter something
  * in the password field (like an email address). Default is on.
  *
@@ -38,7 +38,7 @@
  * in broken GUIs like W95 is often given by the user. The Default is off.
  *
  * Dirk.vanGulik@jrc.it; http://ewse.ceo.org; http://me-www.jrc.it/~dirkx
- * 
+ *
  */
 
 #include "apr_strings.h"
@@ -113,7 +113,7 @@
 
 static const command_rec authn_anon_cmds[] =
 {
-    AP_INIT_ITERATE("Anonymous", anon_set_string_slots, NULL, OR_AUTHCFG, 
+    AP_INIT_ITERATE("Anonymous", anon_set_string_slots, NULL, OR_AUTHCFG,
      "a space-separated list of user IDs"),
     AP_INIT_FLAG("Anonymous_MustGiveEmail", ap_set_flag_slot,
      (void *)APR_OFFSETOF(authn_anon_config_rec, mustemail),

Modified: httpd/httpd/trunk/modules/aaa/mod_authn_dbd.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/aaa/mod_authn_dbd.c?rev=332306&r1=332305&r2=332306&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authn_dbd.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authn_dbd.c Thu Nov 10 07:11:44 2005
@@ -202,7 +202,7 @@
         &authn_dbd_password,
         &authn_dbd_realm
     };
-    
+
     ap_register_provider(p, AUTHN_PROVIDER_GROUP, "dbd", "0", &authn_dbd_provider);
 }
 module AP_MODULE_DECLARE_DATA authn_dbd_module =

Modified: httpd/httpd/trunk/modules/aaa/mod_authn_dbm.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/aaa/mod_authn_dbm.c?rev=332306&r1=332305&r2=332306&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authn_dbm.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authn_dbm.c Thu Nov 10 07:11:44 2005
@@ -16,9 +16,9 @@
 
 /*
  * http_auth: authentication
- * 
+ *
  * Rob McCool & Brian Behlendorf.
- * 
+ *
  * Adapted to Apache by rst.
  *
  */
@@ -54,12 +54,12 @@
     return conf;
 }
 
-static const char *set_dbm_type(cmd_parms *cmd, 
-                                void *dir_config, 
+static const char *set_dbm_type(cmd_parms *cmd,
+                                void *dir_config,
                                 const char *arg)
 {
     authn_dbm_config_rec *conf = dir_config;
-   
+
     conf->dbmtype = apr_pstrdup(cmd->pool, arg);
     return NULL;
 }
@@ -85,7 +85,7 @@
     apr_datum_t key, val;
     apr_status_t rv;
 
-    rv = apr_dbm_open_ex(&f, dbmtype, dbmfile, APR_DBM_READONLY, 
+    rv = apr_dbm_open_ex(&f, dbmtype, dbmfile, APR_DBM_READONLY,
                          APR_OS_DEFAULT, pool);
 
     if (rv != APR_SUCCESS) {
@@ -106,7 +106,7 @@
     }
 
     apr_dbm_close(f);
-    
+
     return rv;
 }
 

Modified: httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c?rev=332306&r1=332305&r2=332306&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c Thu Nov 10 07:11:44 2005
@@ -67,9 +67,9 @@
     int compare_dn_on_server;       /* If true, will use server to do DN compare */
 
     int have_ldap_url;              /* Set if we have found an LDAP url */
- 
+
     apr_array_header_t *groupattr;  /* List of Group attributes */
-    int group_attrib_is_dn;         /* If true, the group attribute is the DN, otherwise, 
+    int group_attrib_is_dn;         /* If true, the group attribute is the DN, otherwise,
                                         it's the exact string passed by the HTTP client */
 
     int secure;                     /* True if SSL connections are requested */
@@ -106,12 +106,12 @@
 {
     int lang_len;
     char *charset;
-    
+
     if (!language)          /* our default codepage */
         return apr_pstrdup(p, "ISO-8859-1");
     else
         lang_len = strlen(language);
-    
+
     charset = (char*) apr_hash_get(charset_conversions, language, APR_HASH_KEY_STRING);
 
     if (!charset) {
@@ -163,14 +163,14 @@
  * combined with a filter made up of the attribute provided with the URL,
  * and the actual username passed by the HTTP client. For example, assume
  * that the LDAP URL is
- * 
+ *
  *   ldap://ldap.airius.com/ou=People, o=Airius?uid??(posixid=*)
  *
  * Further, assume that the userid passed by the client was `userj'.  The
  * search filter will be (&(posixid=*)(uid=userj)).
  */
 #define FILTER_LENGTH MAX_STRING_LEN
-static void authn_ldap_build_filter(char *filtbuf, 
+static void authn_ldap_build_filter(char *filtbuf,
                              request_rec *r,
                              const char* sent_user,
                              const char* sent_filter,
@@ -210,13 +210,13 @@
         }
     }
 
-    /* 
-     * Create the first part of the filter, which consists of the 
+    /*
+     * Create the first part of the filter, which consists of the
      * config-supplied portions.
      */
     apr_snprintf(filtbuf, FILTER_LENGTH, "(&(%s)(%s=", filter, sec->attribute);
 
-    /* 
+    /*
      * Now add the client-supplied username to the filter, ensuring that any
      * LDAP filter metachars are escaped.
      */
@@ -264,8 +264,8 @@
 #endif
     *q = '\0';
 
-    /* 
-     * Append the closing parens of the filter, unless doing so would 
+    /*
+     * Append the closing parens of the filter, unless doing so would
      * overrun the buffer.
      */
     if (q + 2 <= filtbuf_end)
@@ -274,7 +274,7 @@
 
 static void *create_authnz_ldap_dir_config(apr_pool_t *p, char *d)
 {
-    authn_ldap_config_t *sec = 
+    authn_ldap_config_t *sec =
         (authn_ldap_config_t *)apr_pcalloc(p, sizeof(authn_ldap_config_t));
 
     sec->pool = p;
@@ -284,7 +284,7 @@
 /*
     sec->authz_enabled = 1;
 */
-    sec->groupattr = apr_array_make(p, GROUPATTR_MAX_ELTS, 
+    sec->groupattr = apr_array_make(p, GROUPATTR_MAX_ELTS,
                                     sizeof(struct mod_auth_ldap_groupattr_entry_t));
 
     sec->have_ldap_url = 0;
@@ -347,9 +347,9 @@
     if (!sec->enabled) {
         return AUTH_USER_NOT_FOUND;
     }
-*/    
+*/
 
-    /* 
+    /*
      * Basic sanity checks before any LDAP operations even happen.
      */
     if (!sec->have_ldap_url) {
@@ -365,7 +365,7 @@
                                        sec->secure);
     }
     else {
-        ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, 
+        ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
                       "[%" APR_PID_T_FMT "] auth_ldap authenticate: no sec->host - weird...?", getpid());
         return AUTH_GENERAL_ERROR;
     }
@@ -405,7 +405,7 @@
 
     /* handle bind failure */
     if (result != LDAP_SUCCESS) {
-        ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, 
+        ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
                       "[%" APR_PID_T_FMT "] auth_ldap authenticate: "
                       "user %s authentication failed; URI %s [%s][%s]",
                       getpid(), user, r->uri, ldc->reason, ldap_err2string(result));
@@ -442,7 +442,7 @@
         }
     }
 
-    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, 
+    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
                   "[%" APR_PID_T_FMT "] auth_ldap authenticate: accepting %s", getpid(), user);
 
     return AUTH_GRANTED;
@@ -491,7 +491,7 @@
     if (!sec->enabled) {
         return DECLINED;
     }
-*/    
+*/
 
     if (!sec->have_ldap_url) {
         return DECLINED;
@@ -506,12 +506,12 @@
                                   apr_pool_cleanup_null);
     }
     else {
-        ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, 
+        ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
                       "[%" APR_PID_T_FMT "] auth_ldap authorise: no sec->host - weird...?", getpid());
         return sec->auth_authoritative? HTTP_UNAUTHORIZED : DECLINED;
     }
 
-    /* 
+    /*
      * If there are no elements in the group attribute array, the default should be
      * member and uniquemember; populate the array now.
      */
@@ -583,49 +583,49 @@
 
         t = reqs[x].requirement;
         w = ap_getword_white(r->pool, &t);
-    
+
         if (strcmp(w, "ldap-user") == 0) {
             if (req->dn == NULL || strlen(req->dn) == 0) {
                 ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
                               "[%" APR_PID_T_FMT "] auth_ldap authorise: "
-                              "require user: user's DN has not been defined; failing authorisation", 
+                              "require user: user's DN has not been defined; failing authorisation",
                               getpid());
                 return sec->auth_authoritative? HTTP_UNAUTHORIZED : DECLINED;
             }
-            /* 
+            /*
              * First do a whole-line compare, in case it's something like
              *   require user Babs Jensen
              */
             result = util_ldap_cache_compare(r, ldc, sec->url, req->dn, sec->attribute, t);
             switch(result) {
                 case LDAP_COMPARE_TRUE: {
-                    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, 
+                    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
                                   "[%" APR_PID_T_FMT "] auth_ldap authorise: "
                                   "require user: authorisation successful", getpid());
                     return OK;
                 }
                 default: {
-                    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, 
+                    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
                                   "[%" APR_PID_T_FMT "] auth_ldap authorise: require user: "
                                   "authorisation failed [%s][%s]", getpid(),
                                   ldc->reason, ldap_err2string(result));
                 }
             }
-            /* 
-             * Now break apart the line and compare each word on it 
+            /*
+             * Now break apart the line and compare each word on it
              */
             while (t[0]) {
                 w = ap_getword_conf(r->pool, &t);
                 result = util_ldap_cache_compare(r, ldc, sec->url, req->dn, sec->attribute, w);
                 switch(result) {
                     case LDAP_COMPARE_TRUE: {
-                        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, 
+                        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
                                       "[%" APR_PID_T_FMT "] auth_ldap authorise: "
                                       "require user: authorisation successful", getpid());
                         return OK;
                     }
                     default: {
-                        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, 
+                        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
                                       "[%" APR_PID_T_FMT "] auth_ldap authorise: "
                                       "require user: authorisation failed [%s][%s]",
                                       getpid(), ldc->reason, ldap_err2string(result));
@@ -637,7 +637,7 @@
             if (req->dn == NULL || strlen(req->dn) == 0) {
                 ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
                               "[%" APR_PID_T_FMT "] auth_ldap authorise: "
-                              "require dn: user's DN has not been defined; failing authorisation", 
+                              "require dn: user's DN has not been defined; failing authorisation",
                               getpid());
                 return sec->auth_authoritative? HTTP_UNAUTHORIZED : DECLINED;
             }
@@ -645,13 +645,13 @@
             result = util_ldap_cache_comparedn(r, ldc, sec->url, req->dn, t, sec->compare_dn_on_server);
             switch(result) {
                 case LDAP_COMPARE_TRUE: {
-                    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, 
+                    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
                                   "[%" APR_PID_T_FMT "] auth_ldap authorise: "
                                   "require dn: authorisation successful", getpid());
                     return OK;
                 }
                 default: {
-                    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, 
+                    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
                                   "[%" APR_PID_T_FMT "] auth_ldap authorise: "
                                   "require dn \"%s\": LDAP error [%s][%s]",
                                   getpid(), t, ldc->reason, ldap_err2string(result));
@@ -666,42 +666,42 @@
                 if (req->dn == NULL || strlen(req->dn) == 0) {
                     ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
                                   "[%" APR_PID_T_FMT "] auth_ldap authorise: require group: "
-                                  "user's DN has not been defined; failing authorisation", 
+                                  "user's DN has not been defined; failing authorisation",
                                   getpid());
                     return sec->auth_authoritative? HTTP_UNAUTHORIZED : DECLINED;
                 }
             }
             else {
                 if (req->user == NULL || strlen(req->user) == 0) {
-                    /* We weren't called in the authentication phase, so we didn't have a 
+                    /* We weren't called in the authentication phase, so we didn't have a
                      * chance to set the user field. Do so now. */
                     req->user = r->user;
                 }
             }
 
-            ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, 
+            ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
                           "[%" APR_PID_T_FMT "] auth_ldap authorise: require group: "
-                          "testing for group membership in \"%s\"", 
+                          "testing for group membership in \"%s\"",
                           getpid(), t);
 
             for (i = 0; i < sec->groupattr->nelts; i++) {
-                ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, 
+                ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
                               "[%" APR_PID_T_FMT "] auth_ldap authorise: require group: "
                               "testing for %s: %s (%s)", getpid(),
                               ent[i].name, sec->group_attrib_is_dn ? req->dn : req->user, t);
 
-                result = util_ldap_cache_compare(r, ldc, sec->url, t, ent[i].name, 
+                result = util_ldap_cache_compare(r, ldc, sec->url, t, ent[i].name,
                                      sec->group_attrib_is_dn ? req->dn : req->user);
                 switch(result) {
                     case LDAP_COMPARE_TRUE: {
-                        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, 
+                        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
                                       "[%" APR_PID_T_FMT "] auth_ldap authorise: require group: "
                                       "authorisation successful (attribute %s) [%s][%s]",
                                       getpid(), ent[i].name, ldc->reason, ldap_err2string(result));
                         return OK;
                     }
                     default: {
-                        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, 
+                        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
                                       "[%" APR_PID_T_FMT "] auth_ldap authorise: require group \"%s\": "
                                       "authorisation failed [%s][%s]",
                                       getpid(), t, ldc->reason, ldap_err2string(result));
@@ -713,7 +713,7 @@
             if (req->dn == NULL || strlen(req->dn) == 0) {
                 ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
                               "[%" APR_PID_T_FMT "] auth_ldap authorise: "
-                              "require ldap-attribute: user's DN has not been defined; failing authorisation", 
+                              "require ldap-attribute: user's DN has not been defined; failing authorisation",
                               getpid());
                 return sec->auth_authoritative? HTTP_UNAUTHORIZED : DECLINED;
             }
@@ -728,17 +728,17 @@
                                                  w, value);
                 switch(result) {
                     case LDAP_COMPARE_TRUE: {
-                        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 
+                        ap_log_rerror(APLOG_MARK, APLOG_DEBUG,
                                       0, r, "[%" APR_PID_T_FMT "] auth_ldap authorise: "
                                       "require attribute: authorisation "
                                       "successful", getpid());
                         return OK;
                     }
                     default: {
-                        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 
+                        ap_log_rerror(APLOG_MARK, APLOG_DEBUG,
                                       0, r, "[%" APR_PID_T_FMT "] auth_ldap authorise: "
                                       "require attribute: authorisation "
-                                      "failed [%s][%s]", getpid(), 
+                                      "failed [%s][%s]", getpid(),
                                       ldc->reason, ldap_err2string(result));
                     }
                 }
@@ -748,13 +748,13 @@
             if (req->dn == NULL || strlen(req->dn) == 0) {
                 ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
                               "[%" APR_PID_T_FMT "] auth_ldap authorise: "
-                              "require ldap-filter: user's DN has not been defined; failing authorisation", 
+                              "require ldap-filter: user's DN has not been defined; failing authorisation",
                               getpid());
                 return sec->auth_authoritative? HTTP_UNAUTHORIZED : DECLINED;
             }
             if (t[0]) {
                 ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
-                              "[%" APR_PID_T_FMT "] auth_ldap authorise: checking filter %s", 
+                              "[%" APR_PID_T_FMT "] auth_ldap authorise: checking filter %s",
                               getpid(), t);
 
                 /* Build the username filter */
@@ -767,33 +767,33 @@
                 /* Make sure that the filtered search returned the correct user dn */
                 if (result == LDAP_SUCCESS) {
                     ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
-                                  "[%" APR_PID_T_FMT "] auth_ldap authorise: checking dn match %s", 
+                                  "[%" APR_PID_T_FMT "] auth_ldap authorise: checking dn match %s",
                                   getpid(), dn);
-                    result = util_ldap_cache_comparedn(r, ldc, sec->url, req->dn, dn, 
+                    result = util_ldap_cache_comparedn(r, ldc, sec->url, req->dn, dn,
                          sec->compare_dn_on_server);
                 }
 
                 switch(result) {
                     case LDAP_COMPARE_TRUE: {
-                        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 
+                        ap_log_rerror(APLOG_MARK, APLOG_DEBUG,
                                       0, r, "[%" APR_PID_T_FMT "] auth_ldap authorise: "
                                       "require ldap-filter: authorisation "
                                       "successful", getpid());
                         return OK;
                     }
                     case LDAP_FILTER_ERROR: {
-                        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 
+                        ap_log_rerror(APLOG_MARK, APLOG_DEBUG,
                                       0, r, "[%" APR_PID_T_FMT "] auth_ldap authorise: "
                                       "require ldap-filter: %s authorisation "
-                                      "failed [%s][%s]", getpid(), 
+                                      "failed [%s][%s]", getpid(),
                                       filtbuf, ldc->reason, ldap_err2string(result));
                         break;
                     }
                     default: {
-                        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 
+                        ap_log_rerror(APLOG_MARK, APLOG_DEBUG,
                                       0, r, "[%" APR_PID_T_FMT "] auth_ldap authorise: "
                                       "require ldap-filter: authorisation "
-                                      "failed [%s][%s]", getpid(), 
+                                      "failed [%s][%s]", getpid(),
                                       ldc->reason, ldap_err2string(result));
                     }
                 }
@@ -802,19 +802,19 @@
     }
 
     if (!method_restricted) {
-        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, 
-                      "[%" APR_PID_T_FMT "] auth_ldap authorise: agreeing because non-restricted", 
+        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+                      "[%" APR_PID_T_FMT "] auth_ldap authorise: agreeing because non-restricted",
                       getpid());
         return OK;
     }
 
     if (!sec->auth_authoritative) {
-        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, 
+        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
                       "[%" APR_PID_T_FMT "] auth_ldap authorise: declining to authorise", getpid());
         return DECLINED;
     }
 
-    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, 
+    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
                   "[%" APR_PID_T_FMT "] auth_ldap authorise: authorisation denied", getpid());
     ap_note_basic_auth_failure (r);
 
@@ -822,11 +822,11 @@
 }
 
 
-/* 
+/*
  * Use the ldap url parsing routines to break up the ldap url into
  * host and port.
  */
-static const char *mod_auth_ldap_parse_url(cmd_parms *cmd, 
+static const char *mod_auth_ldap_parse_url(cmd_parms *cmd,
                                     void *config,
                                     const char *url,
                                     const char *mode)
@@ -855,9 +855,9 @@
     ap_log_error(APLOG_MARK, APLOG_DEBUG, 0,
                  cmd->server, "[%" APR_PID_T_FMT "] auth_ldap url parse: attrib: %s", getpid(), urld->lud_attrs? urld->lud_attrs[0] : "(null)");
     ap_log_error(APLOG_MARK, APLOG_DEBUG, 0,
-                 cmd->server, "[%" APR_PID_T_FMT "] auth_ldap url parse: scope: %s", getpid(), 
-                 (urld->lud_scope == LDAP_SCOPE_SUBTREE? "subtree" : 
-                  urld->lud_scope == LDAP_SCOPE_BASE? "base" : 
+                 cmd->server, "[%" APR_PID_T_FMT "] auth_ldap url parse: scope: %s", getpid(),
+                 (urld->lud_scope == LDAP_SCOPE_SUBTREE? "subtree" :
+                  urld->lud_scope == LDAP_SCOPE_BASE? "base" :
                   urld->lud_scope == LDAP_SCOPE_ONELEVEL? "onelevel" : "unknown"));
     ap_log_error(APLOG_MARK, APLOG_DEBUG, 0,
                  cmd->server, "[%" APR_PID_T_FMT "] auth_ldap url parse: filter: %s", getpid(), urld->lud_filter);
@@ -896,7 +896,7 @@
 
     if (urld->lud_filter) {
         if (urld->lud_filter[0] == '(') {
-            /* 
+            /*
              * Get rid of the surrounding parens; later on when generating the
              * filter, they'll be put back.
              */
@@ -939,7 +939,7 @@
     else
     {
         sec->port = urld->lud_port? urld->lud_port : LDAP_PORT;
-        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, cmd->server, 
+        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, cmd->server,
                      "LDAP: auth_ldap not using SSL connections");
     }
 
@@ -981,7 +981,7 @@
 
     new = apr_array_push(sec->groupattr);
     new->name = apr_pstrdup(cmd->pool, arg);
-  
+
     return NULL;
 }
 
@@ -994,7 +994,7 @@
 
 static const command_rec authnz_ldap_cmds[] =
 {
-    AP_INIT_TAKE12("AuthLDAPURL", mod_auth_ldap_parse_url, NULL, OR_AUTHCFG, 
+    AP_INIT_TAKE12("AuthLDAPURL", mod_auth_ldap_parse_url, NULL, OR_AUTHCFG,
                   "URL to define LDAP connection. This should be an RFC 2255 complaint\n"
                   "URL of the form ldap://host[:port]/basedn[?attrib[?scope[?filter]]].\n"
                   "<ul>\n"
@@ -1079,17 +1079,17 @@
     const char *charset_confname = ap_get_module_config(s->module_config,
                                                       &authnz_ldap_module);
     apr_status_t status;
-    
+
     /*
     authn_ldap_config_t *sec = (authn_ldap_config_t *)
-                                    ap_get_module_config(s->module_config, 
+                                    ap_get_module_config(s->module_config,
                                                          &authnz_ldap_module);
 
     if (sec->secure)
     {
         if (!util_ldap_ssl_supported(s))
         {
-            ap_log_error(APLOG_MARK, APLOG_CRIT, 0, s, 
+            ap_log_error(APLOG_MARK, APLOG_CRIT, 0, s,
                      "LDAP: SSL connections (ldaps://) not supported by utilLDAP");
             return(!OK);
         }
@@ -1112,15 +1112,15 @@
     charset_confname = ap_server_root_relative(p, charset_confname);
     if (!charset_confname) {
         ap_log_error(APLOG_MARK, APLOG_ERR, APR_EBADPATH, s,
-                     "Invalid charset conversion config path %s", 
+                     "Invalid charset conversion config path %s",
                      (const char *)ap_get_module_config(s->module_config,
                                                         &authnz_ldap_module));
         return HTTP_INTERNAL_SERVER_ERROR;
     }
-    if ((status = ap_pcfg_openfile(&f, ptemp, charset_confname)) 
+    if ((status = ap_pcfg_openfile(&f, ptemp, charset_confname))
                 != APR_SUCCESS) {
         ap_log_error(APLOG_MARK, APLOG_ERR, status, s,
-                     "could not open charset conversion config file %s.", 
+                     "could not open charset conversion config file %s.",
                      charset_confname);
         return HTTP_INTERNAL_SERVER_ERROR;
     }
@@ -1143,11 +1143,11 @@
         }
     }
     ap_cfg_closefile(f);
-    
+
     to_charset = derive_codepage_from_lang (p, "utf-8");
     if (to_charset == NULL) {
         ap_log_error(APLOG_MARK, APLOG_ERR, status, s,
-                     "could not find the UTF-8 charset in the file %s.", 
+                     "could not find the UTF-8 charset in the file %s.",
                      charset_confname);
         return HTTP_INTERNAL_SERVER_ERROR;
     }

Modified: httpd/httpd/trunk/modules/aaa/mod_authz_dbm.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/aaa/mod_authz_dbm.c?rev=332306&r1=332305&r2=332306&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authz_dbm.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authz_dbm.c Thu Nov 10 07:11:44 2005
@@ -90,7 +90,7 @@
  *      key=username value=":"groupname [":"anything here is ignored]
  * otherwise we now (0.8.14+) assume that the format is
  *      key=username value=groupname
- * The first allows the password and group files to be the same 
+ * The first allows the password and group files to be the same
  * physical DBM file;   key=username value=password":"groupname[":"anything]
  *
  * mark@telescope.org, 22Sep95
@@ -104,7 +104,7 @@
     apr_status_t retval;
     apr_dbm_t *f;
 
-    retval = apr_dbm_open_ex(&f, dbtype, dbmgrpfile, APR_DBM_READONLY, 
+    retval = apr_dbm_open_ex(&f, dbtype, dbmgrpfile, APR_DBM_READONLY,
                              APR_OS_DEFAULT, r->pool);
 
     if (retval != APR_SUCCESS) {
@@ -166,10 +166,10 @@
 
         t = reqs[x].requirement;
         w = ap_getword_white(r->pool, &t);
- 
+
         if (!strcasecmp(w, "file-group")) {
             filegroup = apr_table_get(r->notes, AUTHZ_GROUP_NOTE);
-            
+
             if (!filegroup) {
                 /* mod_authz_owner is not present or not
                  * authoritative. We are just a helper module for testing

Modified: httpd/httpd/trunk/modules/aaa/mod_authz_default.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/aaa/mod_authz_default.c?rev=332306&r1=332305&r2=332306&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authz_default.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authz_default.c Thu Nov 10 07:11:44 2005
@@ -59,7 +59,7 @@
     const apr_array_header_t *reqs_arr = ap_requires(r);
     require_line *reqs;
 
-    /* BUG FIX: tadc, 11-Nov-1995.  If there is no "requires" directive, 
+    /* BUG FIX: tadc, 11-Nov-1995.  If there is no "requires" directive,
      * then any user will do.
      */
     if (!reqs_arr) {
@@ -84,7 +84,7 @@
     }
 
     /* if we aren't authoritative, any require directive could be
-     * considered valid even if noone groked it.  However, if we are 
+     * considered valid even if noone groked it.  However, if we are
      * authoritative, we can warn the user they did something wrong.
      *
      * That something could be a missing "AuthAuthoritative off", but

Modified: httpd/httpd/trunk/modules/aaa/mod_authz_groupfile.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/aaa/mod_authz_groupfile.c?rev=332306&r1=332305&r2=332306&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authz_groupfile.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authz_groupfile.c Thu Nov 10 07:11:44 2005
@@ -21,24 +21,24 @@
  * and the presense of a
  *
  *         require group <list-of-groups>
- * 
+ *
  * In an applicable limit/directory block for that method.
  *
- * If there are no AuthGroupFile directives valid for 
+ * If there are no AuthGroupFile directives valid for
  * the request; we DECLINED.
- * 
+ *
  * If the AuthGroupFile is defined; but somehow not
  * accessible: we SERVER_ERROR (was DECLINED).
  *
  * If there are no 'require ' directives defined for
  * this request then we DECLINED (was OK).
- * 
+ *
  * If there are no 'require ' directives valid for
  * this request method then we DECLINED. (was OK)
  *
  * If there are any 'require group' blocks and we
  * are not in any group - we HTTP_UNAUTHORIZE
- * unless we are non-authoritative; in which  
+ * unless we are non-authoritative; in which
  * case we DECLINED.
  *
  */
@@ -65,12 +65,12 @@
 {
     authz_groupfile_config_rec *conf = apr_palloc(p, sizeof(*conf));
 
-    conf->groupfile = NULL;    
+    conf->groupfile = NULL;
     conf->authoritative = 1; /* keep the fortress secure by default */
     return conf;
 }
 
-static const char *set_authz_groupfile_slot(cmd_parms *cmd, void *offset, const char *f, 
+static const char *set_authz_groupfile_slot(cmd_parms *cmd, void *offset, const char *f,
                                  const char *t)
 {
     if (t && strcmp(t, "standard")) {
@@ -163,7 +163,7 @@
     char *reason = NULL;
 
     /* If there is no group file - then we are not
-     * configured. So decline. 
+     * configured. So decline.
      */
     if (!(conf->groupfile)) {
         return DECLINED;
@@ -171,8 +171,8 @@
 
     if (!reqs_arr) {
         return DECLINED; /* XXX change from legacy */
-    } 
-    
+    }
+
     reqs = (require_line *)reqs_arr->elts;
 
     for (x = 0; x < reqs_arr->nelts; x++) {
@@ -187,7 +187,7 @@
         /* needs mod_authz_owner to be present */
         if (!strcasecmp(w, "file-group")) {
             filegroup = apr_table_get(r->notes, AUTHZ_GROUP_NOTE);
-            
+
             if (!filegroup) {
                 /* mod_authz_owner is not present or not
                  * authoritative. We are just a helper module for testing

Modified: httpd/httpd/trunk/modules/aaa/mod_authz_host.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/aaa/mod_authz_host.c?rev=332306&r1=332305&r2=332306&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authz_host.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authz_host.c Thu Nov 10 07:11:44 2005
@@ -16,9 +16,9 @@
 
 /*
  * Security options etc.
- * 
+ *
  * Module derived from code originally written by Rob McCool
- * 
+ *
  */
 
 #include "apr_strings.h"
@@ -106,7 +106,7 @@
     return NULL;
 }
 
-static const char *allow_cmd(cmd_parms *cmd, void *dv, const char *from, 
+static const char *allow_cmd(cmd_parms *cmd, void *dv, const char *from,
                              const char *where_c)
 {
     authz_host_dir_conf *d = (authz_host_dir_conf *) dv;

Modified: httpd/httpd/trunk/modules/aaa/mod_authz_owner.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/aaa/mod_authz_owner.c?rev=332306&r1=332305&r2=332306&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authz_owner.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authz_owner.c Thu Nov 10 07:11:44 2005
@@ -195,7 +195,7 @@
     if (!required_owner || !conf->authoritative) {
         return DECLINED;
     }
-    
+
     /* allow file-group passed to group db modules either if this is the
      * only applicable requirement here or if a file-owner failed but we're
      * not authoritative.

Modified: httpd/httpd/trunk/modules/aaa/mod_authz_user.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/aaa/mod_authz_user.c?rev=332306&r1=332305&r2=332306&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authz_user.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authz_user.c Thu Nov 10 07:11:44 2005
@@ -61,7 +61,7 @@
     const apr_array_header_t *reqs_arr = ap_requires(r);
     require_line *reqs;
 
-    /* BUG FIX: tadc, 11-Nov-1995.  If there is no "requires" directive, 
+    /* BUG FIX: tadc, 11-Nov-1995.  If there is no "requires" directive,
      * then any user will do.
      */
     if (!reqs_arr) {
@@ -81,7 +81,7 @@
             return OK;
         }
         if (!strcasecmp(w, "user")) {
-            /* And note that there are applicable requirements 
+            /* And note that there are applicable requirements
              * which we consider ourselves the owner of.
              */
             required_user = 1;
@@ -107,7 +107,7 @@
                   "access to %s failed, reason: user '%s' does not meet "
                   "'require'ments for user/valid-user to be allowed access",
                   r->uri, user);
-        
+
     ap_note_auth_failure(r);
     return HTTP_UNAUTHORIZED;
 }

Modified: httpd/httpd/trunk/modules/arch/netware/libprews.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/arch/netware/libprews.c?rev=332306&r1=332305&r2=332306&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/arch/netware/libprews.c (original)
+++ httpd/httpd/trunk/modules/arch/netware/libprews.c Thu Nov 10 07:11:44 2005
@@ -19,7 +19,7 @@
   stops.  By using these functions instead of defining a main()
   and calling ExitThread(TSR_THREAD, 0), the load time of the
   shared NLM is faster and memory size reduced.
-   
+
   You may also want to override these in your own Apache module
   to do any cleanup other than the mechanism Apache modules
   provide.
@@ -58,7 +58,7 @@
 
 #ifdef USE_WINSOCK
     WSADATA wsaData;
-    
+
     return WSAStartup((WORD) MAKEWORD(2, 0), &wsaData);
 #else
     return 0;

Modified: httpd/httpd/trunk/modules/arch/netware/mod_netware.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/arch/netware/mod_netware.c?rev=332306&r1=332305&r2=332306&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/arch/netware/mod_netware.c (original)
+++ httpd/httpd/trunk/modules/arch/netware/mod_netware.c Thu Nov 10 07:11:44 2005
@@ -75,9 +75,9 @@
 
     if (*ext == '.')
         ++ext;
-  
+
     if (CGIhdlr != NULL) {
-        len = strlen(CGIhdlr);    
+        len = strlen(CGIhdlr);
         for (i=0; i<len; i++) {
             if (CGIhdlr[i] == '\\') {
                 CGIhdlr[i] = '/';
@@ -94,7 +94,7 @@
 }
 
 static apr_status_t ap_cgi_build_command(const char **cmd, const char ***argv,
-                                         request_rec *r, apr_pool_t *p, 
+                                         request_rec *r, apr_pool_t *p,
                                          cgi_exec_info_t *e_info)
 {
     char *ext = NULL;
@@ -104,7 +104,7 @@
     apr_file_t *fh;
     const char *args = "";
 
-    d = (netware_dir_config *)ap_get_module_config(r->per_dir_config, 
+    d = (netware_dir_config *)ap_get_module_config(r->per_dir_config,
                                                &netware_module);
 
     if (e_info->process_cgi) {
@@ -135,7 +135,7 @@
     if (!ext) {
         ext = "";
     }
-    
+
     /* eliminate the '.' if there is one */
     if (*ext == '.')
         ++ext;
@@ -173,7 +173,7 @@
 }
 
 static const command_rec netware_cmds[] = {
-AP_INIT_TAKE23("CGIMapExtension", set_extension_map, NULL, OR_FILEINFO, 
+AP_INIT_TAKE23("CGIMapExtension", set_extension_map, NULL, OR_FILEINFO,
               "Full path to the CGI NLM module followed by a file extension. If the "
               "first parameter is set to \"OS\" then the following file extension is "
               "treated as NLM. The optional parameter \"detach\" can be specified if "

Modified: httpd/httpd/trunk/modules/arch/netware/mod_nw_ssl.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/arch/netware/mod_nw_ssl.c?rev=332306&r1=332305&r2=332306&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/arch/netware/mod_nw_ssl.c (original)
+++ httpd/httpd/trunk/modules/arch/netware/mod_nw_ssl.c Thu Nov 10 07:11:44 2005
@@ -29,7 +29,7 @@
  *
  *  Examples:
  *
- *          SecureListen 443 "SSL CertificateIP"  
+ *          SecureListen 443 "SSL CertificateIP"
  *          SecureListen 123.45.67.89:443 mycert
  */
 
@@ -183,7 +183,7 @@
     hep = gethostbyname(w);
 
     if ((!hep) || (hep->h_addrtype != AF_INET || !hep->h_addr_list[0])) {
-        /* XXX Should be echoing by h_errno the actual failure, no? 
+        /* XXX Should be echoing by h_errno the actual failure, no?
          * ap_log_error would be good here.  Better yet - APRize.
          */
         fprintf(stderr, "Cannot resolve host name %s --- exiting!\n", w);
@@ -212,7 +212,7 @@
             sl->used = 1;
             return sl->fd;
         }
-    }    
+    }
     return -1;
 }
 
@@ -221,11 +221,11 @@
     seclistenup_rec *sl;
 
     for (sl = ap_seclistenersup; sl; sl = sl->next) {
-        if ((sl->port == (c->local_addr)->port) && 
+        if ((sl->port == (c->local_addr)->port) &&
             ((strcmp(sl->addr, "0.0.0.0") == 0) || (strcmp(sl->addr, c->local_ip) == 0))) {
             return sl->key;
         }
-    }    
+    }
     return NULL;
 }
 
@@ -239,7 +239,7 @@
     unsigned int optParam;
     WSAPROTOCOL_INFO SecureProtoInfo;
     int no = 1;
-    
+
     if (server->sin_addr.s_addr != htonl(INADDR_ANY))
         apr_snprintf(addr, sizeof(addr), "address %s port %d",
             inet_ntoa(server->sin_addr), ntohs(server->sin_port));
@@ -251,22 +251,22 @@
 
     SecureProtoInfo.iAddressFamily = AF_INET;
     SecureProtoInfo.iSocketType = SOCK_STREAM;
-    SecureProtoInfo.iProtocol = IPPROTO_TCP;   
+    SecureProtoInfo.iProtocol = IPPROTO_TCP;
     SecureProtoInfo.iSecurityScheme = SECURITY_PROTOCOL_SSL;
 
     s = WSASocket(AF_INET, SOCK_STREAM, IPPROTO_TCP,
             (LPWSAPROTOCOL_INFO)&SecureProtoInfo, 0, 0);
-            
+
     if (s == INVALID_SOCKET) {
         ap_log_error(APLOG_MARK, APLOG_CRIT, WSAGetLastError(), sconf,
-                     "make_secure_socket: failed to get a socket for %s", 
+                     "make_secure_socket: failed to get a socket for %s",
                      addr);
         return -1;
     }
-        
+
     if (!mutual) {
         optParam = SO_SSL_ENABLE | SO_SSL_SERVER;
-                    
+
         if (WSAIoctl(s, SO_SSL_SET_FLAGS, (char *)&optParam,
             sizeof(optParam), NULL, 0, NULL, NULL, NULL)) {
             ap_log_error(APLOG_MARK, APLOG_CRIT, WSAGetLastError(), sconf,
@@ -303,7 +303,7 @@
     }
 
     optParam = SO_TLS_UNCLEAN_SHUTDOWN;
-    WSAIoctl(s, SO_SSL_SET_FLAGS, (char *)&optParam, sizeof(optParam), 
+    WSAIoctl(s, SO_SSL_SET_FLAGS, (char *)&optParam, sizeof(optParam),
              NULL, 0, NULL, NULL, NULL);
 
     return s;
@@ -355,7 +355,7 @@
     	unicpy(keyFileName, L"SSL CertificateIP");
     	sWS2Opts.wallet = keyFileName;    /* no client certificate */
     	sWS2Opts.walletlen = unilen(keyFileName);
-    
+
     	sNWTLSOpts.walletProvider 		= WAL_PROV_KMO;	//the wallet provider defined in wdefs.h
     }
 
@@ -368,7 +368,7 @@
         if(SOCKET_ERROR == rcode ){
         ap_log_error(APLOG_MARK, APLOG_ERR, 0, c->base_server,
                      "Error: %d with ioctl (SO_TLS_SET_CLIENT)", WSAGetLastError());
-        }		
+        }
         return rcode;
 }
 
@@ -379,11 +379,11 @@
     struct nwtlsopts    sNWTLSOpts;
     unicode_t SASKey[512];
     unsigned long ulFlag;
-    
+
     memset((char *)&sWS2Opts, 0, sizeof(struct tlsserveropts));
     memset((char *)&sNWTLSOpts, 0, sizeof(struct nwtlsopts));
-    
-    
+
+
     ulFlag = SO_TLS_ENABLE;
     rcode = WSAIoctl(socketHnd, SO_TLS_SET_FLAGS, &ulFlag, sizeof(unsigned long), NULL, 0, NULL, NULL, NULL);
     if(rcode)
@@ -392,18 +392,18 @@
                      "Error: %d with WSAIoctl(SO_TLS_SET_FLAGS, SO_TLS_ENABLE)", WSAGetLastError());
         goto ERR;
     }
-    
-    
+
+
     ulFlag = SO_TLS_SERVER;
     rcode = WSAIoctl(socketHnd, SO_TLS_SET_FLAGS, &ulFlag, sizeof(unsigned long),NULL, 0, NULL, NULL, NULL);
-    
+
     if(rcode)
     {
         ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
                      "Error: %d with WSAIoctl(SO_TLS_SET_FLAGS, SO_TLS_SERVER)", WSAGetLastError());
         goto ERR;
     }
-    
+
     loc2uni(UNI_LOCAL_DEFAULT, SASKey, key, 0, 0);
 
     //setup the tlsserveropts struct
@@ -413,9 +413,9 @@
     sWS2Opts.sidentries = 0;
     sWS2Opts.siddir = NULL;
     sWS2Opts.options = &sNWTLSOpts;
-    
+
     //setup the nwtlsopts structure
-    
+
     sNWTLSOpts.walletProvider               = WAL_PROV_KMO;
     sNWTLSOpts.keysList                     = NULL;
     sNWTLSOpts.numElementsInKeyList         = 0;
@@ -425,29 +425,29 @@
     sNWTLSOpts.reserved1                    = NULL;
     sNWTLSOpts.reserved2                    = NULL;
     sNWTLSOpts.reserved3                    = NULL;
-    
-    
-    rcode = WSAIoctl(socketHnd, 
-                     SO_TLS_SET_SERVER, 
-                     &sWS2Opts, 
-                     sizeof(struct tlsserveropts), 
-                     NULL, 
-                     0, 
-                     NULL, 
-                     NULL, 
+
+
+    rcode = WSAIoctl(socketHnd,
+                     SO_TLS_SET_SERVER,
+                     &sWS2Opts,
+                     sizeof(struct tlsserveropts),
+                     NULL,
+                     0,
+                     NULL,
+                     NULL,
                      NULL);
     if(SOCKET_ERROR == rcode) {
         ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
                      "Error: %d with WSAIoctl(SO_TLS_SET_SERVER)", WSAGetLastError());
         goto ERR;
     }
-    
+
 ERR:
     return rcode;
 }
 
-static const char *set_secure_listener(cmd_parms *cmd, void *dummy, 
-                                       const char *ips, const char* key, 
+static const char *set_secure_listener(cmd_parms *cmd, void *dummy,
+                                       const char *ips, const char* key,
                                        const char* mutual)
 {
     NWSSLSrvConfigRec* sc = get_nwssl_cfg(cmd->server);
@@ -459,27 +459,27 @@
     apr_sockaddr_t *sa;
     int found_listener = 0;
 
-    
-    if (err != NULL) 
+
+    if (err != NULL)
         return err;
 
     ports = strchr(ips, ':');
-    
-    if (ports != NULL) {    
+
+    if (ports != NULL) {
         if (ports == ips)
             return "Missing IP address";
         else if (ports[1] == '\0')
             return "Address must end in :<port-number>";
-            
+
         *(ports++) = '\0';
     }
     else {
         ports = (char*)ips;
     }
-    
-    new = apr_pcalloc(cmd->server->process->pool, sizeof(seclisten_rec)); 
+
+    new = apr_pcalloc(cmd->server->process->pool, sizeof(seclisten_rec));
     new->local_addr.sin_family = AF_INET;
-    
+
     if (ports == ips) {
         new->local_addr.sin_addr.s_addr = htonl(INADDR_ANY);
         addr = apr_pstrdup(cmd->server->process->pool, "0.0.0.0");
@@ -488,12 +488,12 @@
         new->local_addr.sin_addr.s_addr = parse_addr(ips, NULL);
         addr = apr_pstrdup(cmd->server->process->pool, ips);
     }
-    
+
     port = atoi(ports);
-    
-    if (!port) 
+
+    if (!port)
         return "Port must be numeric";
-        
+
     /* If the specified addr:port was created previously, put the listen
        socket record back on the ap_listeners list so that the socket
        will be reused rather than recreated */
@@ -529,7 +529,7 @@
     }
 
     apr_table_add(sc->sltable, ports, addr);
-    
+
     new->local_addr.sin_port = htons(port);
     new->fd = -1;
     new->used = 0;
@@ -542,7 +542,7 @@
     return NULL;
 }
 
-static const char *set_secure_upgradeable_listener(cmd_parms *cmd, void *dummy, 
+static const char *set_secure_upgradeable_listener(cmd_parms *cmd, void *dummy,
                                        const char *ips, const char* key)
 {
     NWSSLSrvConfigRec* sc = get_nwssl_cfg(cmd->server);
@@ -552,23 +552,23 @@
     unsigned short port;
     seclistenup_rec *new;
 
-    if (err != NULL) 
+    if (err != NULL)
         return err;
 
     ports = strchr(ips, ':');
-    
-    if (ports != NULL) {    
+
+    if (ports != NULL) {
         if (ports == ips)
             return "Missing IP address";
         else if (ports[1] == '\0')
             return "Address must end in :<port-number>";
-            
+
         *(ports++) = '\0';
     }
     else {
         ports = (char*)ips;
     }
-    
+
     if (ports == ips) {
         addr = apr_pstrdup(cmd->pool, "0.0.0.0");
     }
@@ -577,13 +577,13 @@
     }
 
     port = atoi(ports);
-    
-    if (!port) 
+
+    if (!port)
         return "Port must be numeric";
 
     apr_table_set(sc->slutable, ports, addr);
 
-    new = apr_pcalloc(cmd->pool, sizeof(seclistenup_rec)); 
+    new = apr_pcalloc(cmd->pool, sizeof(seclistenup_rec));
     new->next = ap_seclistenersup;
     strcpy(new->key, key);
     new->addr = addr;
@@ -632,8 +632,8 @@
     seclisten_rec **secwalk;
     apr_sockaddr_t *sa;
     int found;
-    
-  /* Pull all of the listeners that were created by mod_nw_ssl out of the 
+
+  /* Pull all of the listeners that were created by mod_nw_ssl out of the
      ap_listeners list so that the normal listen socket processing does
      automatically close them */
     nw_old_listeners = NULL;
@@ -647,7 +647,7 @@
                 ap_listen_rec *new;
                 seclisten_rec *secnew;
                 apr_port_t oldport;
-    
+
                 oldport = sa->port;
                 /* If both ports are equivalent, then if their names are equivalent,
                  * then we will re-use the existing record.
@@ -670,7 +670,7 @@
                     break;
                 }
             }
-    
+
             walk = &(*walk)->next;
         }
         if (!found && &(*secwalk)->next) {
@@ -684,10 +684,10 @@
     ap_seclistenersup = NULL;
     certlist = apr_array_make(pconf, 1, sizeof(char *));
 
-    /* Now that we have removed all of the mod_nw_ssl created socket records, 
+    /* Now that we have removed all of the mod_nw_ssl created socket records,
        allow the normal listen socket handling to occur.
        NOTE: If for any reason mod_nw_ssl is removed as a built-in module,
-       the following call must be put back into the pre-config handler of the 
+       the following call must be put back into the pre-config handler of the
        MPM.  It is only here to ensure that mod_nw_ssl fixes up the listen
        socket list before anything else looks at it. */
     ap_listen_pre_config();
@@ -697,7 +697,7 @@
 
 static int nwssl_pre_connection(conn_rec *c, void *csd)
 {
-    
+
     if (apr_table_get(c->notes, "nwconv-ssl")) {
         convert_secure_socket(c, (apr_socket_t*)csd);
     }
@@ -708,7 +708,7 @@
         csd_data->is_secure = 0;
         ap_set_module_config(c->conn_config, &nwssl_module, (void*)csd_data);
     }
-    
+
     return OK;
 }
 
@@ -770,8 +770,8 @@
         }
 
         if (sl->fd < 0)
-            sl->fd = make_secure_socket(s->process->pool, &sl->local_addr, sl->key, sl->mutual, s);            
-            
+            sl->fd = make_secure_socket(s->process->pool, &sl->local_addr, sl->key, sl->mutual, s);
+
         if (sl->fd >= 0) {
             apr_os_sock_info_t sock_info;
 
@@ -784,10 +784,10 @@
             apr_os_sock_make(&sd, &sock_info, s->process->pool);
 
             lr = apr_pcalloc(s->process->pool, sizeof(ap_listen_rec));
-        
+
             if (lr) {
                 lr->sd = sd;
-                if ((status = apr_sockaddr_info_get(&lr->bind_addr, sl->addr, APR_UNSPEC, sl->port, 0, 
+                if ((status = apr_sockaddr_info_get(&lr->bind_addr, sl->addr, APR_UNSPEC, sl->port, 0,
                                               s->process->pool)) != APR_SUCCESS) {
                     ap_log_perror(APLOG_MARK, APLOG_CRIT, status, pconf,
                                  "alloc_listener: failed to set up sockaddr for %s:%d", sl->addr, sl->port);
@@ -800,7 +800,7 @@
         } else {
             return HTTP_INTERNAL_SERVER_ERROR;
         }
-    } 
+    }
 
     for (slu = ap_seclistenersup; slu; slu = slu->next) {
         /* Check the listener list for a matching upgradeable listener */
@@ -815,7 +815,7 @@
             ap_log_perror(APLOG_MARK, APLOG_WARNING, 0, plog,
                          "No Listen directive found for upgradeable listener %s:%d", slu->addr, slu->port);
         }
-    }    
+    }
 
     build_cert_list(s->process->pool);
 
@@ -842,8 +842,8 @@
 {
     conn_rec *c = (conn_rec*)rec;
 
-    if (value && 
-        ((strcmp(value, "0.0.0.0") == 0) || (strcmp(value, c->local_ip) == 0))) 
+    if (value &&
+        ((strcmp(value, "0.0.0.0") == 0) || (strcmp(value, c->local_ip) == 0)))
     {
         return 0;
     }
@@ -998,7 +998,7 @@
 
         case 'R':
         case 'r':
-            if (strcEQ(var, "REQUEST_METHOD")) 
+            if (strcEQ(var, "REQUEST_METHOD"))
                 result = r->method;
             else if (strcEQ(var, "REQUEST_SCHEME"))
                 result = ap_http_scheme(r);
@@ -1007,7 +1007,7 @@
             else if (strcEQ(var, "REQUEST_FILENAME"))
                 result = r->filename;
             else if (strcEQ(var, "REMOTE_HOST"))
-                result = ap_get_remote_host(r->connection, r->per_dir_config, 
+                result = ap_get_remote_host(r->connection, r->per_dir_config,
                                             REMOTE_NAME, NULL);
             else if (strcEQ(var, "REMOTE_IDENT"))
                 result = ap_get_remote_logname(r);
@@ -1018,7 +1018,7 @@
         case 'S':
         case 's':
             if (strcEQn(var, "SSL", 3)) break; /* shortcut common case */
-            
+
             if (strcEQ(var, "SERVER_ADMIN"))
                 result = r->server->server_admin;
             else if (strcEQ(var, "SERVER_NAME"))
@@ -1030,7 +1030,7 @@
             else if (strcEQ(var, "SCRIPT_FILENAME"))
                 result = r->filename;
             break;
-            
+
         default:
             if (strcEQ(var, "PATH_INFO"))
                 result = r->path_info;
@@ -1055,7 +1055,7 @@
 
                 /* XXX-Can't get specific SSL info from NetWare */
         /* SSLConnRec *sslconn = myConnConfig(c);
-        if (strlen(var) > 4 && strcEQn(var, "SSL_", 4) 
+        if (strlen(var) > 4 && strcEQn(var, "SSL_", 4)
             && sslconn && sslconn->ssl)
             result = ssl_var_lookup_ssl(p, c, var+4);*/
 
@@ -1196,7 +1196,7 @@
     }
 
     key = get_port_key(r->connection);
-    
+
     if (csd && key) {
         int sockdes;
         apr_os_sock_get(&sockdes, csd);
@@ -1216,8 +1216,8 @@
     ap_log_error(APLOG_MARK, APLOG_INFO, 0, r->server,
                  "Awaiting re-negotiation handshake");
 
-    /* Now that we have initialized the ssl connection which added the ssl_io_filter, 
-       pass the brigade off to the connection based output filters so that the 
+    /* Now that we have initialized the ssl connection which added the ssl_io_filter,
+       pass the brigade off to the connection based output filters so that the
        request can complete encrypted */
     return ap_pass_brigade(f->c->output_filters, bb);
 }
@@ -1258,7 +1258,7 @@
 
     APR_REGISTER_OPTIONAL_FN(ssl_is_https);
     APR_REGISTER_OPTIONAL_FN(ssl_var_lookup);
-    
+
     APR_REGISTER_OPTIONAL_FN(ssl_proxy_enable);
     APR_REGISTER_OPTIONAL_FN(ssl_engine_disable);
 }



Mime
View raw message