www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

No more magic numbers.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1532746 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jim Jagielski
2013-10-16 12:21:49 +00:00
parent a00a928dd2
commit a91c47c2e5
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
modules/proxy/mod_proxy.c
View File

@@ -177,15 +177,17 @@ static const char *set_worker_param(apr_pool_t *p,
else if (!strcasecmp(key, "route")) {
/* Worker route.
*/
if (strlen(val) >= PROXY_WORKER_MAX_ROUTE_SIZE)
return "Route length must be < 64 characters";
if (strlen(val) >= sizeof(worker->s->route))
return apr_psprintf(p, "Route length must be < %d characters",
(int)sizeof(worker->s->route));
PROXY_STRNCPY(worker->s->route, val);
}
else if (!strcasecmp(key, "redirect")) {
/* Worker redirection route.
*/
if (strlen(val) >= PROXY_WORKER_MAX_ROUTE_SIZE)
return "Redirect length must be < 64 characters";
if (strlen(val) >= sizeof(worker->s->redirect))
return apr_psprintf(p, "Redirect length must be < %d characters",
(int)sizeof(worker->s->redirect));
PROXY_STRNCPY(worker->s->redirect, val);
}
else if (!strcasecmp(key, "status")) {
@@ -256,8 +258,9 @@ static const char *set_worker_param(apr_pool_t *p,
worker->s->conn_timeout_set = 1;
}
else if (!strcasecmp(key, "flusher")) {
if (strlen(val) >= PROXY_WORKER_MAX_SCHEME_SIZE)
return "flusher name length must be < 16 characters";
if (strlen(val) >= sizeof(worker->s->flusher))
apr_psprintf(p, "flusher name length must be < %d characters",
(int)sizeof(worker->s->flusher));
PROXY_STRNCPY(worker->s->flusher, val);
}
else {
@@ -280,8 +283,9 @@ static const char *set_balancer_param(proxy_server_conf *conf,
* Set to something like JSESSIONID or
* PHPSESSIONID, etc..,
*/
if (strlen(val) > (PROXY_BALANCER_MAX_STICKY_SIZE-1))
return "stickysession length must be < 64 characters";
if (strlen(val) >= sizeof(balancer->s->sticky_path))
apr_psprintf(p, "stickysession length must be < %d characters",
(int)sizeof(balancer->s->sticky_path));
PROXY_STRNCPY(balancer->s->sticky_path, val);
PROXY_STRNCPY(balancer->s->sticky, val);