From 04da55f0b7ec7bfddbbdb7ce0ad6abb34a9d2474 Mon Sep 17 00:00:00 2001 From: Rainer Jung Date: Fri, 5 Feb 2016 12:12:14 +0000 Subject: [PATCH] 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. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728650 13f79535-47bb-0310-9956-ffa450edef68 --- modules/proxy/proxy_util.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c index 92e0c9cd7a..2b8b73d4dc 100644 --- a/modules/proxy/proxy_util.c +++ b/modules/proxy/proxy_util.c @@ -2647,12 +2647,12 @@ static apr_status_t send_http_connect(proxy_conn_rec *backend, } -#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_connect_uds(apr_socket_t *sock, } return APR_SUCCESS; -} +#else + return APR_ENOTIMPL; #endif +} PROXY_DECLARE(int) ap_proxy_connect_backend(const char *proxy_function, proxy_conn_rec *conn, -- 2.50.1