httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r1728650 - /httpd/httpd/trunk/modules/proxy/proxy_util.c
Date Fri, 05 Feb 2016 12:12:14 GMT
Author: rjung
Date: Fri Feb  5 12:12:14 2016
New Revision: 1728650

URL: http://svn.apache.org/viewvc?rev=1728650&view=rev
Log:
Provide dummy impl of ap_proxy_connect_uds()
in case when APR_HAVE_SYS_UN_H is not defined.
Just returns APR_ENOTIMPL.

This helps symbol export/import handling on
Netware and also seems to be more correct,
because mod_proxy.h contains ap_proxy_connect_uds()
unconditionally.

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=1728650&r1=1728649&r2=1728650&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/trunk/modules/proxy/proxy_util.c Fri Feb  5 12:12:14 2016
@@ -2647,12 +2647,12 @@ static apr_status_t send_http_connect(pr
 }
 
 
-#if APR_HAVE_SYS_UN_H
 /* TODO: In APR 2.x: Extend apr_sockaddr_t to possibly be a path !!! */
 PROXY_DECLARE(apr_status_t) ap_proxy_connect_uds(apr_socket_t *sock,
                                                  const char *uds_path,
                                                  apr_pool_t *p)
 {
+#if APR_HAVE_SYS_UN_H
     apr_status_t rv;
     apr_os_sock_t rawsock;
     apr_interval_time_t t;
@@ -2694,8 +2694,10 @@ PROXY_DECLARE(apr_status_t) ap_proxy_con
     }
 
     return APR_SUCCESS;
-}
+#else
+    return APR_ENOTIMPL;
 #endif
+}
 
 PROXY_DECLARE(int) ap_proxy_connect_backend(const char *proxy_function,
                                             proxy_conn_rec *conn,



Mime
View raw message