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

mod_proxy: better check for worker->s->is_name_matchable

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1609688 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jan Kaluža
2014-07-11 11:09:34 +00:00
parent c0a52f109d
commit 058348d405
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/proxy/mod_proxy.c
View File

@@ -1664,7 +1664,7 @@ static const char *
PROXY_COPY_CONF_PARAMS(worker, conf);
}
else if ((use_regex != 0) ^ (worker->s->is_name_matchable)) {
else if ((use_regex != 0) ^ (worker->s->is_name_matchable != 0)) {
return apr_pstrcat(cmd->temp_pool, "ProxyPass/<Proxy> and "
"ProxyPassMatch/<ProxyMatch> can't be used "
"altogether with the same worker name ",
@@ -2383,7 +2383,7 @@ static const char *proxysection(cmd_parms *cmd, void *mconfig, const char *arg)
return apr_pstrcat(cmd->temp_pool, thiscmd->name,
" ", err, NULL);
}
else if ((use_regex != 0) ^ (worker->s->is_name_matchable)) {
else if ((use_regex != 0) ^ (worker->s->is_name_matchable != 0)) {
return apr_pstrcat(cmd->temp_pool, "ProxyPass/<Proxy> and "
"ProxyPassMatch/<ProxyMatch> can't be used "
"altogether with the same worker name ",