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

Minor style nits.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@987853 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Rainer Jung
2010-08-22 09:46:23 +00:00
parent 8f840cb763
commit d59332de14
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/proxy/mod_proxy.c
View File

@@ -446,7 +446,7 @@ static int alias_match(const char *uri, const char *alias_fakename)
/* We reach the end of the uri before the end of "alias_fakename" /* We reach the end of the uri before the end of "alias_fakename"
* for example uri is "/" and alias_fakename "/examples" * for example uri is "/" and alias_fakename "/examples"
*/ */
if (urip == end_uri && aliasp!=end_fakename) { if (urip == end_uri && aliasp != end_fakename) {
return 0; return 0;
} }
@@ -1162,7 +1162,7 @@ static void * merge_proxy_config(apr_pool_t *p, void *basev, void *overridesv)
ps->maxfwd_set = overrides->maxfwd_set || base->maxfwd_set; ps->maxfwd_set = overrides->maxfwd_set || base->maxfwd_set;
ps->error_override = (overrides->error_override_set == 0) ? base->error_override : overrides->error_override; ps->error_override = (overrides->error_override_set == 0) ? base->error_override : overrides->error_override;
ps->error_override_set = overrides->error_override_set || base->error_override_set; ps->error_override_set = overrides->error_override_set || base->error_override_set;
ps->timeout= (overrides->timeout_set == 0) ? base->timeout : overrides->timeout; ps->timeout = (overrides->timeout_set == 0) ? base->timeout : overrides->timeout;
ps->timeout_set = overrides->timeout_set || base->timeout_set; ps->timeout_set = overrides->timeout_set || base->timeout_set;
ps->badopt = (overrides->badopt_set == 0) ? base->badopt : overrides->badopt; ps->badopt = (overrides->badopt_set == 0) ? base->badopt : overrides->badopt;
ps->badopt_set = overrides->badopt_set || base->badopt_set; ps->badopt_set = overrides->badopt_set || base->badopt_set;
@@ -1668,12 +1668,12 @@ static const char*
ap_get_module_config(parms->server->module_config, &proxy_module); ap_get_module_config(parms->server->module_config, &proxy_module);
int timeout; int timeout;
timeout=atoi(arg); timeout = atoi(arg);
if (timeout<1) { if (timeout<1) {
return "Proxy Timeout must be at least 1 second."; return "Proxy Timeout must be at least 1 second.";
} }
psf->timeout_set=1; psf->timeout_set = 1;
psf->timeout=apr_time_from_sec(timeout); psf->timeout = apr_time_from_sec(timeout);
return NULL; return NULL;
} }
@@ -1945,7 +1945,7 @@ static const char *proxysection(cmd_parms *cmd, void *mconfig, const char *arg)
"> directive missing closing '>'", NULL); "> directive missing closing '>'", NULL);
} }
arg=apr_pstrndup(cmd->pool, arg, endp-arg); arg = apr_pstrndup(cmd->pool, arg, endp-arg);
if (!arg) { if (!arg) {
if (thiscmd->cmd_data) if (thiscmd->cmd_data)
@@ -2339,7 +2339,7 @@ static void register_hooks(apr_pool_t *p)
/* fixup before mod_rewrite, so that the proxied url will not /* fixup before mod_rewrite, so that the proxied url will not
* escaped accidentally by our fixup. * escaped accidentally by our fixup.
*/ */
static const char * const aszSucc[]={ "mod_rewrite.c", NULL }; static const char * const aszSucc[] = { "mod_rewrite.c", NULL};
/* Only the mpm_winnt has child init hook handler. /* Only the mpm_winnt has child init hook handler.
* make sure that we are called after the mpm * make sure that we are called after the mpm
* initializes. * initializes.