httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r576513 - in /httpd/httpd/branches/2.2.x: STATUS modules/proxy/mod_proxy.c
Date Mon, 17 Sep 2007 16:44:12 GMT
Author: jim
Date: Mon Sep 17 09:44:11 2007
New Revision: 576513

URL: http://svn.apache.org/viewvc?rev=576513&view=rev
Log:
Merge r421252 from trunk:

Issue a warning when the same worker name is reused.

Submitted by: jfclere
Reviewed by: jim

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=576513&r1=576512&r2=576513&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Mon Sep 17 09:44:11 2007
@@ -79,13 +79,6 @@
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-    * mod_proxy: Issue a warning when the same worker name is reused.
-      Trunk version of patch:
-         http://svn.apache.org/viewvc?view=rev&revision=421252
-      Backport version for 2.2.x of patch:
-         Trunk version of patch works
-      +1: jim, niq, rpluem
-
     * filters|proxy: Return METHOD_NOT_ALLOWED, not FORBIDDEN, to a TRACE
       request when TraceEnable is Off.  This agrees with our documentation,
       and with our Allow: header in response to OPTIONS.

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=576513&r1=576512&r2=576513&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 Mon Sep 17 09:44:11 2007
@@ -1169,6 +1169,9 @@
             const char *err = ap_proxy_add_worker(&worker, cmd->pool, conf, r);
             if (err)
                 return apr_pstrcat(cmd->temp_pool, "ProxyPass ", err, NULL);
+        } else {
+            ap_log_error(APLOG_MARK, APLOG_WARNING, 0, cmd->server,
+                         "worker %s already used by another worker", worker->name);
         }
         PROXY_COPY_CONF_PARAMS(worker, conf);
 
@@ -1575,6 +1578,9 @@
         const char *err;
         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,
+                         "worker %s already used by another worker", worker->name);
     }
     PROXY_COPY_CONF_PARAMS(worker, conf);
 



Mime
View raw message