From: Jim Jagielski <jim@apache.org>
Date: Mon, 17 Sep 2007 16:44:11 +0000 (+0000)
Subject: Merge r421252 from trunk:
X-Git-Tag: 2.2.7~401
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ba6ed1a4db3ad6396d1accfdd6a42031c45a194;p=thirdparty%2Fapache%2Fhttpd.git

Merge r421252 from trunk:

Issue a warning when the same worker name is reused.

Submitted by: jfclere
Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@576513 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index 908eb1072da..34e52e4f251 100644
--- a/STATUS
+++ b/STATUS
@@ -79,13 +79,6 @@ RELEASE SHOWSTOPPERS:
 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.
diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index 4f7fdcc82c2..58798c4a006 100644
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -1169,6 +1169,9 @@ static const char *
             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 @@ static const char *add_member(cmd_parms *cmd, void *dummy, const char *arg)
         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);