Commit b9593031 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

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
parent 4372a08c

STATUS

+0 −5
Original line number Diff line number Diff line
@@ -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

modules/proxy/mod_proxy.c

+3 −2
Original line number Diff line number Diff line
@@ -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