From commits-return-10438-apmail-apr-commits-archive=apr.apache.org@apr.apache.org Sun Jun 07 19:03:36 2009 Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 63618 invoked from network); 7 Jun 2009 19:03:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 7 Jun 2009 19:03:35 -0000 Received: (qmail 67097 invoked by uid 500); 7 Jun 2009 19:03:47 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 67029 invoked by uid 500); 7 Jun 2009 19:03:47 -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 67020 invoked by uid 99); 7 Jun 2009 19:03:47 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 07 Jun 2009 19:03:47 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Sun, 07 Jun 2009 19:03:44 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4E4A023888D6; Sun, 7 Jun 2009 19:03:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r782430 - /apr/apr/trunk/build/apr_hints.m4 Date: Sun, 07 Jun 2009 19:03:23 -0000 To: commits@apr.apache.org From: trawick@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090607190323.4E4A023888D6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: trawick Date: Sun Jun 7 19:03:22 2009 New Revision: 782430 URL: http://svn.apache.org/viewvc?rev=782430&view=rev Log: forward-port part of r781073 from the 1.3.x branch as in 1.3.x, kqueue() is disabled poll() use is unchanged in my testing, poll() use is okay in 1.4.x and trunk because the wakeup pipe support added in 1.4.x has a side-effect of working around OS X poll() bogosity Modified: apr/apr/trunk/build/apr_hints.m4 Modified: apr/apr/trunk/build/apr_hints.m4 URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/apr_hints.m4?rev=782430&r1=782429&r2=782430&view=diff ============================================================================== --- apr/apr/trunk/build/apr_hints.m4 (original) +++ apr/apr/trunk/build/apr_hints.m4 Sun Jun 7 19:03:22 2009 @@ -194,14 +194,15 @@ *-apple-darwin*) APR_ADDTO(CPPFLAGS, [-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK -no-cpp-precomp]) APR_SETIFNULL(apr_posixsem_is_global, [yes]) - # kqueue works in 10.5/Darwin 9.x. Disable on all older versions. case $host in + *-apple-darwin*) + # APR's use of kqueue has triggered kernel panics for some + # 10.5.x (Darwin 9.x) users when running the entire test suite. + # In 10.4.x, use of kqueue would cause the socket tests to hang. + APR_SETIFNULL(ac_cv_func_kqueue, [no]) + ;; *-apple-darwin[[0-8]].*) - # kqueue is broken on OS X, the poll tests work, but the socket tests - # hang when it's turned on. if you decide to reenable this please be - # sure to test that ALL the tests continue to work with it turned on. - APR_SETIFNULL(ac_cv_func_kqueue, [no]) - APR_SETIFNULL(ac_cv_func_poll, [no]) # See issue 34332 + APR_SETIFNULL(ac_cv_func_poll, [no]) # See issue 34332 ;; esac ;;