mturk 2004/08/09 01:04:55
Modified: ajp/proxy mod_proxy.c
Log:
Fix some config checking params.
Revision Changes Path
1.30 +9 -9 jakarta-tomcat-connectors/ajp/proxy/mod_proxy.c
Index: mod_proxy.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/proxy/mod_proxy.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- mod_proxy.c 6 Aug 2004 11:42:39 -0000 1.29
+++ mod_proxy.c 9 Aug 2004 08:04:55 -0000 1.30
@@ -856,7 +856,7 @@
char *val = strchr(word, '=');
if (!val) {
if (cmd->path)
- return "Invalid ProxyPass parameter. Paramet must be in the
form key=value";
+ return "Invalid ProxyPass parameter. Paramet must be in the
form 'key=value'";
else
return "ProxyPass can not have a path when defined in a
location";
}
@@ -883,12 +883,12 @@
cmd->pool,
conf, r);
if (err)
- return apr_pstrcat(cmd->temp_pool, "BalancerMember: ", err, NULL);
+ return apr_pstrcat(cmd->temp_pool, "ProxyPass ", err, NULL);
}
for (i = 0; i < arr->nelts; i++) {
const char *err = set_balancer_param(balancer, elts[i].key,
elts[i].val);
if (err)
- return apr_pstrcat(cmd->temp_pool, "ProxyPass: ", err, NULL);
+ return apr_pstrcat(cmd->temp_pool, "ProxyPass ", err, NULL);
}
}
else {
@@ -896,14 +896,14 @@
if (!worker) {
const char *err = ap_proxy_add_worker(&worker, cmd->pool, conf, r);
if (err)
- return apr_pstrcat(cmd->temp_pool, "ProxyPass: ", err, NULL);
+ return apr_pstrcat(cmd->temp_pool, "ProxyPass ", err, NULL);
}
PROXY_COPY_CONF_PARAMS(worker, conf);
for (i = 0; i < arr->nelts; i++) {
const char *err = set_worker_param(worker, elts[i].key, elts[i].val);
if (err)
- return apr_pstrcat(cmd->temp_pool, "ProxyPass: ", err, NULL);
+ return apr_pstrcat(cmd->temp_pool, "ProxyPass ", err, NULL);
}
}
return NULL;
@@ -1249,7 +1249,7 @@
if (cmd->path)
return "BalancerMember can not have a balancer name when
defined in a location";
else
- return "Invalid BalancerMember parameter. Paramet must be in
the form key=value";
+ return "Invalid BalancerMember parameter. Paramet must be in
the form 'key=value'";
else
*val++ = '\0';
apr_table_setn(params, word, val);
@@ -1268,7 +1268,7 @@
if (!worker) {
const char *err;
if ((err = ap_proxy_add_worker(&worker, cmd->pool, conf, name)) != NULL)
- return apr_pstrcat(cmd->temp_pool, "BalancerMember: ", err, NULL);
+ return apr_pstrcat(cmd->temp_pool, "BalancerMember ", err, NULL);
}
PROXY_COPY_CONF_PARAMS(worker, conf);
@@ -1277,7 +1277,7 @@
for (i = 0; i < arr->nelts; i++) {
const char *err = set_worker_param(worker, elts[i].key, elts[i].val);
if (err)
- return apr_pstrcat(cmd->temp_pool, "BalancerMember: ", err, NULL);
+ return apr_pstrcat(cmd->temp_pool, "BalancerMember ", err, NULL);
}
/* Try to find the balancer */
balancer = ap_proxy_get_balancer(cmd->temp_pool, conf, name);
@@ -1286,7 +1286,7 @@
cmd->pool,
conf, path);
if (err)
- return apr_pstrcat(cmd->temp_pool, "BalancerMember: ", err, NULL);
+ return apr_pstrcat(cmd->temp_pool, "BalancerMember ", err, NULL);
}
/* Add the worker to the load balancer */
ap_proxy_add_worker_to_balancer(balancer, worker);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
