From: Jan Kaluža <jkaluza@apache.org>
Date: Fri, 11 Jul 2014 11:09:34 +0000 (+0000)
Subject: mod_proxy: better check for worker->s->is_name_matchable
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9f1f464b7089a424796610282ef6a47a67460cc;p=thirdparty%2Fapache%2Fhttpd.git

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
---

diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index 9beffacb6c1..e0bb7245ae7 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/<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 ",