Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 89026 invoked from network); 14 Oct 2007 23:45:39 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 14 Oct 2007 23:45:38 -0000 Received: (qmail 21985 invoked by uid 500); 14 Oct 2007 23:45:26 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 21934 invoked by uid 500); 14 Oct 2007 23:45:26 -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 21921 invoked by uid 99); 14 Oct 2007 23:45:26 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 14 Oct 2007 16:45:26 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 14 Oct 2007 23:45:38 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E59C21A9832; Sun, 14 Oct 2007 16:44:47 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r584640 - /apr/apr/branches/1.2.x/test/testsockets.c Date: Sun, 14 Oct 2007 23:44:47 -0000 To: commits@apr.apache.org From: wrowe@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071014234447.E59C21A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: wrowe Date: Sun Oct 14 16:44:46 2007 New Revision: 584640 URL: http://svn.apache.org/viewvc?rev=584640&view=rev Log: Fix testsockets the crufty way, backporting the silly omission of APR_STATUS_IS_EAFNOSUPPORT. Modified: apr/apr/branches/1.2.x/test/testsockets.c Modified: apr/apr/branches/1.2.x/test/testsockets.c URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/test/testsockets.c?rev=584640&r1=584639&r2=584640&view=diff ============================================================================== --- apr/apr/branches/1.2.x/test/testsockets.c (original) +++ apr/apr/branches/1.2.x/test/testsockets.c Sun Oct 14 16:44:46 2007 @@ -59,10 +59,16 @@ /* On recent Linux systems, whilst IPv6 is always supported by glibc, * socket(AF_INET6, ...) calls will fail with EAFNOSUPPORT if the * "ipv6" kernel module is not loaded. */ -#ifdef EAFNOSUPPORT +#if defined(WSAEAFNOSUPPORT) +#define V6_NOT_ENABLED(e) ((e) == APR_OS_START_SYSERR + WSAEAFNOSUPPORT) +#elif defined(SOCEAFNOSUPPORT) +#define V6_NOT_ENABLED(e) ((e) == APR_OS_START_SYSERR + SOCEAFNOSUPPORT) +#elif defined(EAFNOSUPPORT) #define V6_NOT_ENABLED(e) ((e) == EAFNOSUPPORT) +#elif !APR_HAVE_IPV6 +#define V6_NOT_ENABLED(e) (1) #else -#define V6_NOT_ENABLED(e) (0) +#error MUST have an EAFNOSUPPORT class of error code to enable IPv6! #endif static void tcp6_socket(abts_case *tc, void *data) @@ -118,6 +124,10 @@ apr_size_t len = 30; rv = apr_socket_create(&sock, family, SOCK_DGRAM, 0, p); + if ((family == APR_INET6) && V6_NOT_ENABLED(rv)) { + ABTS_NOT_IMPL(tc, "IPv6 not enabled"); + return; + } ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); if (rv != APR_SUCCESS) return;