httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jkal...@apache.org
Subject svn commit: r1609688 - /httpd/httpd/trunk/modules/proxy/mod_proxy.c
Date Fri, 11 Jul 2014 11:09:35 GMT
Author: jkaluza
Date: Fri Jul 11 11:09:34 2014
New Revision: 1609688

URL: http://svn.apache.org/r1609688
Log:
mod_proxy: better check for worker->s->is_name_matchable

Modified:
    httpd/httpd/trunk/modules/proxy/mod_proxy.c

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.c?rev=1609688&r1=1609687&r2=1609688&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.c Fri Jul 11 11:09:34 2014
@@ -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_parm
                     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 ",



Mime
View raw message