Merge r1722137 from trunk:

Don't allow bad value to be updated

Reviewed/backported by: jim

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

diff --git a/STATUS b/STATUS
index 1037e794515c386a4b20cc8f3ba79fe54f3739eb..c467e019e12c09ab9b11b9dc8d276b661268c7ef 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -112,11 +112,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mod_proxy: Prevent invalid loadfactor value from being updated
-     trunk patch: http://svn.apache.org/r1722137
-     2.4.x patch: trunk works
-     +1: jim, covener, ylavic
-
   *) mod_log_config: PR58769: backport GlobalLog directive to 2.4.x
      trunk patch: http://svn.apache.org/r1599535
                   http://svn.apache.org/r1721685 

diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index 05f471b6b501c3a04b0eafad2d88d21153a41653..afbb0748e8f03cff1fd8443b96c06fd53f804697 100644 (file)
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -68,9 +68,10 @@ static const char *set_worker_param(apr_pool_t *p,
         /* Normalized load factor. Used with BalancerMember,
          * it is a number between 1 and 100.
          */
-        worker->s->lbfactor = atoi(val);
-        if (worker->s->lbfactor < 1 || worker->s->lbfactor > 100)
+        ival = atoi(val);
+        if (ival < 1 || ival > 100)
             return "LoadFactor must be a number between 1..100";
+        worker->s->lbfactor = ival;
     }
     else if (!strcasecmp(key, "retry")) {
         /* If set it will give the retry timeout for the worker