httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n..@apache.org
Subject svn commit: r962992 - in /httpd/httpd/branches/2.2.x: STATUS modules/proxy/mod_proxy.c
Date Sun, 11 Jul 2010 06:21:07 GMT
Author: niq
Date: Sun Jul 11 06:21:06 2010
New Revision: 962992

URL: http://svn.apache.org/viewvc?rev=962992&view=rev
Log:
mod_proxy: Tone down a warning message that appears when the same backend
website is reverse proxied two or more times into the frontend URL space.
PR: 48947
minfrin's patch

Modified:
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy.c

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=962992&r1=962991&r2=962992&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Sun Jul 11 06:21:06 2010
@@ -97,14 +97,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
     2.2.x patch: http://people.apache.org/~minfrin/htcacheclean-pid.patch
     +1: minfrin, sf, trawick
 
-  * mod_proxy: Tone down a warning message that appears when the same
-    backend website is reverse proxied two or more times into the
-    frontend URL space.
-    PR: 48947
-    Trunk patch: http://svn.apache.org/viewvc?rev=925850&view=rev
-    2.2.x patch: http://people.apache.org/~minfrin/httpd-proxy-worker-already-used.patch
-    +1: minfrin, trawick, rjung
-
   * Introduce SSLFIPS directive to support OpenSSL FIPS_mode; permits all
     builds of mod_ssl to use 'SSLFIPS off' for portability, but the proper
     build of openssl is required for 'SSLFIPS on'.  

Modified: httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy.c?rev=962992&r1=962991&r2=962992&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 Sun Jul 11 06:21:06 2010
@@ -1362,7 +1362,7 @@ static const char *
             if (err)
                 return apr_pstrcat(cmd->temp_pool, "ProxyPass ", err, NULL);
         } else {
-            ap_log_error(APLOG_MARK, APLOG_WARNING, 0, cmd->server,
+            ap_log_error(APLOG_MARK, APLOG_INFO, 0, cmd->server,
                          "worker %s already used by another worker", worker->name);
         }
         PROXY_COPY_CONF_PARAMS(worker, conf);
@@ -1779,7 +1779,7 @@ static const char *add_member(cmd_parms 
         if ((err = ap_proxy_add_worker(&worker, cmd->pool, conf, name)) != NULL)
             return apr_pstrcat(cmd->temp_pool, "BalancerMember ", err, NULL);
     } else {
-            ap_log_error(APLOG_MARK, APLOG_WARNING, 0, cmd->server,
+            ap_log_error(APLOG_MARK, APLOG_INFO, 0, cmd->server,
                          "worker %s already used by another worker", worker->name);
     }
     PROXY_COPY_CONF_PARAMS(worker, conf);



Mime
View raw message