Commit 6fe23486 authored by Yann Ylavic's avatar Yann Ylavic
Browse files

Revert r1813167 (per review). 

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1813255 13f79535-47bb-0310-9956-ffa450edef68
parent 8f2588ef

CHANGES

+0 −4
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.5.0



  *) mod_proxy_balancer: fix runtime lbfactor value changed in 2.4.28. It is

     assumed to be between 1 and 100 by lbmethods, so normalize it accordingly.

     [Yann Ylavic]



  *) mod_md: v1.0.1, ServerName/Alias names from pure-http: virtual hosts are no longer

     auto-added to a Managed Domain. Error counts of jobs are presisted. When the server

     restarts (gracefully) any errored staging areas are purged to reset the signup/renewal

modules/proxy/mod_proxy.c

+3 −3
Original line number Diff line number Diff line
@@ -104,13 +104,13 @@ static const char *set_worker_param(apr_pool_t *p, 


    if (!strcasecmp(key, "loadfactor")) {

        /* Normalized load factor. Used with BalancerMember,

         * it is a number between 1 and 100 (or 0.01 and 1.0).

         * it is a number between 1 and 100.

         */

        double fval = atof(val);

        ival = fval * 100.0;

        if (ival < 100 || ival > 10000)

            return "LoadFactor must be a number between 1..100";

        worker->s->lbfactor = ival / 100;

        worker->s->lbfactor = ival;

    }

    else if (!strcasecmp(key, "retry")) {

        /* If set it will give the retry timeout for the worker
@@ -2883,7 +2883,7 @@ static int proxy_status_hook(request_rec *r, int flags) 
                ap_rvputs(r, ap_proxy_parse_wstatus(r->pool, *worker), NULL);

                ap_rvputs(r, "</td><td>", (*worker)->s->route, NULL);

                ap_rvputs(r, "</td><td>", (*worker)->s->redirect, NULL);

                ap_rprintf(r, "</td><td>%d</td>", (*worker)->s->lbfactor);

                ap_rprintf(r, "</td><td>%.2f</td>", (float)((*worker)->s->lbfactor)/100.0);

                ap_rprintf(r, "<td>%d</td>", (*worker)->s->lbset);

                ap_rprintf(r, "<td>%" APR_SIZE_T_FMT "</td><td>",

                           (*worker)->s->elected);

modules/proxy/mod_proxy_balancer.c

+9 −8
Original line number Diff line number Diff line
@@ -1093,10 +1093,11 @@ static int balancer_handler(request_rec *r) 
        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01192) "settings worker params");



        if ((val = apr_table_get(params, "w_lf"))) {

            int ival;

            double fval = atof(val);

            int ival = fval * 100.0;

            ival = fval * 100.0;

            if (ival >= 100 && ival <= 10000) {

                wsel->s->lbfactor = ival / 100;

                wsel->s->lbfactor = ival;

                if (bsel)

                    recalc_factors(bsel);

            }
@@ -1363,8 +1364,8 @@ static int balancer_handler(request_rec *r) 
                          "</httpd:scheme>\n", NULL);

                ap_rvputs(r, "          <httpd:hostname>", worker->s->hostname,

                          "</httpd:hostname>\n", NULL);

                ap_rprintf(r, "          <httpd:loadfactor>%d</httpd:loadfactor>\n",

                           worker->s->lbfactor);

                ap_rprintf(r, "          <httpd:loadfactor>%.2f</httpd:loadfactor>\n",

                          (float)(worker->s->lbfactor)/100.0);

                ap_rprintf(r,

                           "          <httpd:port>%d</httpd:port>\n",

                           worker->s->port);
@@ -1417,8 +1418,8 @@ static int balancer_handler(request_rec *r) 
                           "          <httpd:lbstatus>%d</httpd:lbstatus>\n",

                           worker->s->lbstatus);

                ap_rprintf(r,

                           "          <httpd:loadfactor>%d</httpd:loadfactor>\n",

                           worker->s->lbfactor);

                           "          <httpd:loadfactor>%.2f</httpd:loadfactor>\n",

                           (float)(worker->s->lbfactor)/100.0);

                ap_rprintf(r,

                           "          <httpd:transferred>%" APR_OFF_T_FMT "</httpd:transferred>\n",

                           worker->s->transferred);
@@ -1604,7 +1605,7 @@ static int balancer_handler(request_rec *r) 
                          NULL);

                ap_rvputs(r, "</td><td>",

                          ap_escape_html(r->pool, worker->s->redirect), NULL);

                ap_rprintf(r, "</td><td>%d</td>", worker->s->lbfactor);

                ap_rprintf(r, "</td><td>%.2f</td>", (float)(worker->s->lbfactor)/100.0);

                ap_rprintf(r, "<td>%d</td><td>", worker->s->lbset);

                ap_rvputs(r, ap_proxy_parse_wstatus(r->pool, worker), NULL);

                ap_rputs("</td>", r);
@@ -1639,7 +1640,7 @@ static int balancer_handler(request_rec *r) 
            ap_rputs("<form method='POST' enctype='application/x-www-form-urlencoded' action='", r);

            ap_rvputs(r, ap_escape_uri(r->pool, action), "'>\n", NULL);

            ap_rputs("<table><tr><td>Load factor:</td><td><input name='w_lf' id='w_lf' type=text ", r);

            ap_rprintf(r, "value='%d'></td></tr>\n", wsel->s->lbfactor);

            ap_rprintf(r, "value='%.2f'></td></tr>\n", (float)(wsel->s->lbfactor)/100.0);

            ap_rputs("<tr><td>LB Set:</td><td><input name='w_ls' id='w_ls' type=text ", r);

            ap_rprintf(r, "value='%d'></td></tr>\n", wsel->s->lbset);

            ap_rputs("<tr><td>Route:</td><td><input name='w_wr' id='w_wr' type=text ", r);