apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n..@apache.org
Subject svn commit: r641661 - in /apr/apr/trunk: CHANGES poll/unix/port.c
Date Thu, 27 Mar 2008 00:46:07 GMT
Author: niq
Date: Wed Mar 26 17:46:05 2008
New Revision: 641661

URL: http://svn.apache.org/viewvc?rev=641661&view=rev
Log:
PR 42580 - fix return value when apr_pollset_poll interrupted

Modified:
    apr/apr/trunk/CHANGES
    apr/apr/trunk/poll/unix/port.c

Modified: apr/apr/trunk/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/trunk/CHANGES?rev=641661&r1=641660&r2=641661&view=diff
==============================================================================
--- apr/apr/trunk/CHANGES [utf-8] (original)
+++ apr/apr/trunk/CHANGES [utf-8] Wed Mar 26 17:46:05 2008
@@ -1,6 +1,9 @@
                                                      -*- coding: utf-8 -*-
 Changes for APR 1.3.0
 
+  *) Fix return value when apr_pollset_poll interrupted.
+     PR 42580 [Basant Kumar Kukreja <basant.kukreja sun.com>]
+
   *) Add missing semi-colon in Win9x code path of apr_file_open that breaks
      Win9X Debug builds. PR 44329. [Curt Arnold]
 

Modified: apr/apr/trunk/poll/unix/port.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/poll/unix/port.c?rev=641661&r1=641660&r2=641661&view=diff
==============================================================================
--- apr/apr/trunk/poll/unix/port.c (original)
+++ apr/apr/trunk/poll/unix/port.c Wed Mar 26 17:46:05 2008
@@ -295,12 +295,7 @@
 
     if (ret == -1) {
         (*num) = 0;
-        if (errno == ETIME || errno == EINTR) {
-            rv = APR_TIMEUP;
-        }
-        else {
-            rv = APR_EGENERAL;
-        }
+        rv = apr_get_netos_error();
     }
     else if (nget == 0) {
         rv = APR_TIMEUP;



Mime
View raw message