From 058348d405914ab417fb120e81cd3db6ff6fc4c6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Kalu=C5=BEa?= Date: Fri, 11 Jul 2014 11:09:34 +0000 Subject: [PATCH] mod_proxy: better check for worker->s->is_name_matchable git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1609688 13f79535-47bb-0310-9956-ffa450edef68 --- modules/proxy/mod_proxy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c index 9beffacb6c..e0bb7245ae 100644 --- a/modules/proxy/mod_proxy.c +++ b/modules/proxy/mod_proxy.c @@ -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/ and " "ProxyPassMatch/ 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/ and " "ProxyPassMatch/ can't be used " "altogether with the same worker name ", -- 2.40.0