From 3d4399435e3655f5fe21b47e618954b3e49bfa1c Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Tue, 2 Feb 2016 18:04:46 +0000 Subject: [PATCH] Now input-ize the values... next step is to tie into the actual POST git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728166 13f79535-47bb-0310-9956-ffa450edef68 --- modules/proxy/mod_proxy_balancer.c | 36 +++++++++++++++++------------- modules/proxy/mod_proxy_hcheck.c | 10 +++++---- 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/modules/proxy/mod_proxy_balancer.c b/modules/proxy/mod_proxy_balancer.c index c7f16b62b6..896468f628 100644 --- a/modules/proxy/mod_proxy_balancer.c +++ b/modules/proxy/mod_proxy_balancer.c @@ -1486,10 +1486,10 @@ static int balancer_handler(request_rec *r) for (i = 0; i < conf->balancers->nelts; i++) { ap_rputs("
\n

LoadBalancer Status for ", r); - ap_rvputs(r, "pool, r->uri), "?b=", + ap_rvputs(r, "", NULL); ap_rvputs(r, balancer->s->name, " [",balancer->s->sname, "]

\n", NULL); ap_rputs("\n\n" "" @@ -1539,12 +1539,12 @@ static int balancer_handler(request_rec *r) for (n = 0; n < balancer->workers->nelts; n++) { char fbuf[50]; worker = *workers; - ap_rvputs(r, "\n", NULL); ap_rvputs(r, "
MaxMembersStickySessionDisableFailoverTimeoutFailoverAttemptsMethod
\n", NULL); ap_rvputs(r, (*worker->s->uds_path ? "" : ""), ap_proxy_worker_name(r->pool, worker), (*worker->s->uds_path ? "" : ""), "", ap_escape_html(r->pool, worker->s->route), @@ -1583,20 +1583,20 @@ static int balancer_handler(request_rec *r) if (wsel && bsel) { ap_rputs("

Edit worker settings for ", r); ap_rvputs(r, (*wsel->s->uds_path?"":""), ap_proxy_worker_name(r->pool, wsel), (*wsel->s->uds_path?"":""), "

\n", NULL); - ap_rputs("
pool, action), "\">\n", NULL); + ap_rputs("\n", NULL); ap_rputs("\n", wsel->s->lbfactor); ap_rputs("\n", wsel->s->lbset); ap_rputs("\n", r); + ap_rputs("'>\n", r); ap_rputs("\n", r); + ap_rputs("'>\n", r); ap_rputs("", r); ap_rputs("
Load factor:
LB Set:
Route:pool, wsel->s->route), + ap_rvputs(r, "value='", ap_escape_html(r->pool, wsel->s->route), NULL); - ap_rputs("\">
Route Redirect:pool, wsel->s->redirect), + ap_rvputs(r, "value='", ap_escape_html(r->pool, wsel->s->redirect), NULL); - ap_rputs("\">
Status:" "" @@ -1619,7 +1619,7 @@ static int balancer_handler(request_rec *r) if (hc_select_exprs_f) { proxy_hcmethods_t *method = proxy_hcmethods; ap_rputs("\n", r); } ap_rputs("\n", r); diff --git a/modules/proxy/mod_proxy_hcheck.c b/modules/proxy/mod_proxy_hcheck.c index b97dd6414e..cdceddfc81 100644 --- a/modules/proxy/mod_proxy_hcheck.c +++ b/modules/proxy/mod_proxy_hcheck.c @@ -1022,8 +1022,9 @@ static void hc_show_exprs(request_rec *r) continue; } cond = (hc_condition_t *)elts[i].val; - ap_rprintf(r, "\n", elts[i].key, - cond->expr); + ap_rprintf(r, "\n", + ap_escape_html(r->pool, elts[i].key), + ap_escape_html(r->pool, cond->expr)); } ap_rputs("
Ignore Errors
\n\n", r); - ap_rputs("\n", r); - ap_rputs("\n", r); - ap_rprintf(r, "\n", (int)apr_time_sec(wsel->s->interval)); - ap_rprintf(r, "\n", wsel->s->fails); - ap_rprintf(r, "\n", wsel->s->passes); - ap_rprintf(r, "\n", wsel->s->hcuri); + ap_rprintf(r, "\n", (int)apr_time_sec(wsel->s->interval)); + ap_rprintf(r, "\n", wsel->s->passes); + ap_rprintf(r, "\n", wsel->s->fails); + ap_rprintf(r, "\n", ap_escape_html(r->pool, wsel->s->hcuri)); ap_rputs("
Health Check paramValue
Method
Method\n
Expr
Expr\n
Interval (secs)%d
Fails trigger%d
Passes trigger%d
HC uri%s
Interval (secs)
Passes trigger
Fails trigger)
HC uri
\n
%s%s
%s%s
\n", r); } @@ -1044,9 +1045,10 @@ static void hc_select_exprs(request_rec *r, const char *expr) if (!elts[i].key) { continue; } - ap_rprintf(r, "\n", elts[i].key, + ap_rprintf(r, "\n", + ap_escape_html(r->pool, elts[i].key), (!ap_casecmpstr(elts[i].key, expr)) ? "selected" : "", - elts[i].key); + ap_escape_html(r->pool, elts[i].key)); } } -- 2.40.0