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

OK... we display ms, since we want to be able to provide 

values for <1sec, so entries should assume ms input when
using bal-mgr



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799485 13f79535-47bb-0310-9956-ffa450edef68
parent 32123f0c

modules/proxy/mod_proxy_balancer.c

+4 −4
Original line number Diff line number Diff line
@@ -1142,7 +1142,7 @@ static int balancer_handler(request_rec *r) 
        }

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

            apr_interval_time_t hci;

            if (ap_timeout_parameter_parse(val, &hci, "s") == APR_SUCCESS) {

            if (ap_timeout_parameter_parse(val, &hci, "ms") == APR_SUCCESS) {

                if (hci >= AP_WD_TM_SLICE) {

                    wsel->s->interval = hci;

                }
@@ -1615,7 +1615,7 @@ static int balancer_handler(request_rec *r) 
                ap_rputs(apr_strfsize(worker->s->read, fbuf), r);

                if (set_worker_hc_param_f) {

                    ap_rprintf(r, "</td><td>%s</td>", ap_proxy_show_hcmethod(worker->s->method));

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

                    ap_rprintf(r, "<td>%dms</td>", (int)apr_time_msec(worker->s->interval));

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

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

                    ap_rprintf(r, "<td>%s</td>", worker->s->hcuri);
@@ -1684,8 +1684,8 @@ static int balancer_handler(request_rec *r) 
                ap_rputs("<tr><td>Expr</td><td><select name='w_he'>\n", r);

                hc_select_exprs_f(r, wsel->s->hcexpr);

                ap_rputs("</select>\n</td></tr>\n", r);

                ap_rprintf(r, "<tr><td>Interval (secs)</td><td><input name='w_hi' id='w_hi' type='text'"

                           "value='%d'></td></tr>\n", (int)apr_time_sec(wsel->s->interval));

                ap_rprintf(r, "<tr><td>Interval (ms)</td><td><input name='w_hi' id='w_hi' type='text'"

                           "value='%d'></td></tr>\n", (int)apr_time_msec(wsel->s->interval));

                ap_rprintf(r, "<tr><td>Passes trigger</td><td><input name='w_hp' id='w_hp' type='text'"

                           "value='%d'></td></tr>\n", wsel->s->passes);

                ap_rprintf(r, "<tr><td>Fails trigger)</td><td><input name='w_hf' id='w_hf' type='text'"