Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 67860 invoked from network); 27 Jun 2008 17:50:16 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 27 Jun 2008 17:50:16 -0000 Received: (qmail 64291 invoked by uid 500); 27 Jun 2008 17:50:17 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 64182 invoked by uid 500); 27 Jun 2008 17:50:17 -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 64173 invoked by uid 99); 27 Jun 2008 17:50:17 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Jun 2008 10:50:17 -0700 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; Fri, 27 Jun 2008 17:49:27 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6E3682388A04; Fri, 27 Jun 2008 10:49:47 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r672346 - /apr/apr/branches/1.2.x/poll/unix/port.c Date: Fri, 27 Jun 2008 17:49:47 -0000 To: commits@apr.apache.org From: niq@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080627174947.6E3682388A04@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: niq Date: Fri Jun 27 10:49:46 2008 New Revision: 672346 URL: http://svn.apache.org/viewvc?rev=672346&view=rev Log: Fix solaris poll bug - ref http://marc.info/?t=121438277000004&r=1&w=2 Modified: apr/apr/branches/1.2.x/poll/unix/port.c Modified: apr/apr/branches/1.2.x/poll/unix/port.c URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/poll/unix/port.c?rev=672346&r1=672345&r2=672346&view=diff ============================================================================== --- apr/apr/branches/1.2.x/poll/unix/port.c (original) +++ apr/apr/branches/1.2.x/poll/unix/port.c Fri Jun 27 10:49:46 2008 @@ -295,7 +295,15 @@ if (ret == -1) { (*num) = 0; - rv = apr_get_netos_error(); + if (errno == EINTR) { + rv = APR_EINTR; + } + else if (errno == ETIME) { + rv = APR_TIMEUP; + } + else { + rv = APR_EGENERAL; + } } else if (nget == 0) { rv = APR_TIMEUP;