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

Merge r1725445 from trunk: 

No need to search twice for the same value.
Submitted by: jailletc36
Reviewed/backported by: jim


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

STATUS

+0 −5
Original line number Diff line number Diff line
@@ -113,11 +113,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 
  [ start all new proposals below, under PATCHES PROPOSED. ]





  *) mod_lbmethod_heartbeat: No need to search twice for the same value

     trunk patch:  http://svn.apache.org/r1725445

     2.4.x patch:  trunk works

     +1: jailletc36, icing, jim



  *) mod_ssl: Fix some duplicate definitions

     trunk patch:  http://svn.apache.org/r1726888

     2.4.x patch:  trunk works

modules/proxy/balancers/mod_lbmethod_heartbeat.c

+9 −9
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ static apr_status_t readfile_heartbeats(const char *path, apr_hash_t *servers, 
            hb_server_t *server;

            char buf[4096];

            apr_size_t bsize = sizeof(buf);

            const char *ip;

            const char *ip, *val;



            apr_brigade_cleanup(tmpbb);
@@ -180,20 +180,20 @@ static apr_status_t readfile_heartbeats(const char *path, apr_hash_t *servers, 


            argstr_to_table(pool, apr_pstrdup(pool, t), hbt);



            if (apr_table_get(hbt, "busy")) {

                server->busy = atoi(apr_table_get(hbt, "busy"));

            if ((val = apr_table_get(hbt, "busy"))) {

                server->busy = atoi(val);

            }



            if (apr_table_get(hbt, "ready")) {

                server->ready = atoi(apr_table_get(hbt, "ready"));

            if ((val = apr_table_get(hbt, "ready"))) {

                server->ready = atoi(val);

            }



            if (apr_table_get(hbt, "lastseen")) {

                server->seen = atoi(apr_table_get(hbt, "lastseen"));

            if ((val = apr_table_get(hbt, "lastseen"))) {

                server->seen = atoi(val);

            }



            if (apr_table_get(hbt, "port")) {

                server->port = atoi(apr_table_get(hbt, "port"));

            if ((val = apr_table_get(hbt, "port"))) {

                server->port = atoi(val);

            }



            if (server->busy == 0 && server->ready != 0) {