httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1543174 - /httpd/httpd/trunk/modules/proxy/proxy_util.c
Date Mon, 18 Nov 2013 21:37:05 GMT
Author: jim
Date: Mon Nov 18 21:37:05 2013
New Revision: 1543174

URL: http://svn.apache.org/r1543174
Log:
Correct logic... if this is a UDS socket, then bypass all
this.

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

Modified: httpd/httpd/trunk/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/proxy_util.c?rev=1543174&r1=1543173&r2=1543174&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/trunk/modules/proxy/proxy_util.c Mon Nov 18 21:37:05 2013
@@ -2191,8 +2191,9 @@ ap_proxy_determine_connection(apr_pool_t
      *      to check host and port on the conn and be careful about
      *      spilling the cached addr from the worker.
      */
-    if (!conn->hostname || !worker->s->is_address_reusable ||
-        worker->s->disablereuse || *worker->s->uds_path) {
+    if (!(*worker->s->uds_path) &&
+        (!conn->hostname || !worker->s->is_address_reusable ||
+        worker->s->disablereuse)) {
         if (proxyname) {
             conn->hostname = apr_pstrdup(conn->pool, proxyname);
             conn->port = proxyport;



Mime
View raw message