]> granicus.if.org Git - apache/commitdiff
mod_proxy: better check for worker->s->is_name_matchable
authorJan Kaluža <jkaluza@apache.org>
Fri, 11 Jul 2014 11:09:34 +0000 (11:09 +0000)
committerJan Kaluža <jkaluza@apache.org>
Fri, 11 Jul 2014 11:09:34 +0000 (11:09 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1609688 13f79535-47bb-0310-9956-ffa450edef68

modules/proxy/mod_proxy.c

index 9beffacb6c150ca3b2242c358a7d03f90b637afc..e0bb7245ae7c6dcde632b938f40fc8a5b8d16fd3 100644 (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 ",