Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 66517 invoked from network); 21 Mar 2011 20:16:10 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 21 Mar 2011 20:16:10 -0000 Received: (qmail 32539 invoked by uid 500); 21 Mar 2011 20:16:10 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 32506 invoked by uid 500); 21 Mar 2011 20:16:10 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 32499 invoked by uid 99); 21 Mar 2011 20:16:09 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Mar 2011 20:16:09 +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; Mon, 21 Mar 2011 20:16:04 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D82522388901; Mon, 21 Mar 2011 20:15:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1083931 - /apr/apr/trunk/network_io/unix/sockaddr.c Date: Mon, 21 Mar 2011 20:15:32 -0000 To: commits@apr.apache.org From: trawick@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110321201532.D82522388901@eris.apache.org> Author: trawick Date: Mon Mar 21 20:15:32 2011 New Revision: 1083931 URL: http://svn.apache.org/viewvc?rev=1083931&view=rev Log: use apr_get_netos_error() to retrieve the getaddrinfo() error code on Windows before: error: 681001/APR does not understand this error code after: error: 731001/No such host is known. (the latter matches an IPv4-only build) Submitted by: Ivan Zhakov Reviewed by: trawick Modified: apr/apr/trunk/network_io/unix/sockaddr.c Modified: apr/apr/trunk/network_io/unix/sockaddr.c URL: http://svn.apache.org/viewvc/apr/apr/trunk/network_io/unix/sockaddr.c?rev=1083931&r1=1083930&r2=1083931&view=diff ============================================================================== --- apr/apr/trunk/network_io/unix/sockaddr.c (original) +++ apr/apr/trunk/network_io/unix/sockaddr.c Mon Mar 21 20:15:32 2011 @@ -371,12 +371,13 @@ static apr_status_t call_resolver(apr_so } #endif if (error) { -#ifndef WIN32 +#if defined(WIN32) + return apr_get_netos_error(); +#else if (error == EAI_SYSTEM) { return errno; } else -#endif { /* issues with representing this with APR's error scheme: * glibc uses negative values for these numbers, perhaps so @@ -388,6 +389,7 @@ static apr_status_t call_resolver(apr_so #endif return error + APR_OS_START_EAIERR; } +#endif /* WIN32 */ } prev_sa = NULL;