]> granicus.if.org Git - apache/commitdiff
mod_proxy_balancer: Remove wrong error code
authorRainer Jung <rjung@apache.org>
Fri, 17 Aug 2012 14:57:07 +0000 (14:57 +0000)
committerRainer Jung <rjung@apache.org>
Fri, 17 Aug 2012 14:57:07 +0000 (14:57 +0000)
parameter from log message.

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

STATUS
modules/proxy/mod_proxy_balancer.c

diff --git a/STATUS b/STATUS
index e6196d6ba0629a89ce7885e197c0814e60b77e4e..a731ade2696c2314d5303f67a1d0f520dd1c5481 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -88,10 +88,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * mod_proxy_balancer: Remove wrong error code parameter from log message.
-     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1374157
-     2.4.x patch: trunk patch works.
-     +1: rjung, jim, trawick
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
index 26bb1a8856fdb2bc93236d3f72b398b92604e93a..1feb2d7cd05e3c499527b84fefc4c76188b244d6 100644 (file)
@@ -636,7 +636,7 @@ static int proxy_balancer_post_request(proxy_worker *worker,
         for (i = 0; i < balancer->errstatuses->nelts; i++) {
             int val = ((int *)balancer->errstatuses->elts)[i];
             if (r->status == val) {
-                ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01174)
+                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01174)
                               "%s: Forcing worker (%s) into error state " 
                               "due to status code %d matching 'failonstatus' "
                               "balancer parameter",