Return-Path: X-Original-To: apmail-httpd-cvs-archive@www.apache.org Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0F44DDD0A for ; Sat, 2 Mar 2013 17:07:44 +0000 (UTC) Received: (qmail 59996 invoked by uid 500); 2 Mar 2013 17:07:44 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 59944 invoked by uid 500); 2 Mar 2013 17:07:44 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 59937 invoked by uid 99); 2 Mar 2013 17:07:44 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 02 Mar 2013 17:07:44 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 02 Mar 2013 17:07:43 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2C63B23888E7; Sat, 2 Mar 2013 17:07:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1451905 - /httpd/httpd/trunk/modules/proxy/proxy_util.c Date: Sat, 02 Mar 2013 17:07:24 -0000 To: cvs@httpd.apache.org From: jim@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130302170724.2C63B23888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jim Date: Sat Mar 2 17:07:23 2013 New Revision: 1451905 URL: http://svn.apache.org/r1451905 Log: Make AF_UNIX aware... fix Windows/Netware?? 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=1451905&r1=1451904&r2=1451905&view=diff ============================================================================== --- httpd/httpd/trunk/modules/proxy/proxy_util.c (original) +++ httpd/httpd/trunk/modules/proxy/proxy_util.c Sat Mar 2 17:07:23 2013 @@ -2452,7 +2452,9 @@ PROXY_DECLARE(int) ap_proxy_connect_back } } while ((backend_addr || conn->uds_path) && !connected) { - if (conn->uds_path) { +#if APR_HAVE_SYS_UN_H + if (conn->uds_path) + { struct sockaddr_un sa; rv = apr_socket_create(&newsock, AF_UNIX, SOCK_STREAM, 0, @@ -2483,7 +2485,9 @@ PROXY_DECLARE(int) ap_proxy_connect_back break; } } - else { + else +#endif + { if ((rv = apr_socket_create(&newsock, backend_addr->family, SOCK_STREAM, APR_PROTO_TCP, conn->scpool)) != APR_SUCCESS) {