apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n..@apache.org
Subject svn commit: r648007 - in /apr/apr/branches/1.2.x: CHANGES poll/unix/port.c
Date Mon, 14 Apr 2008 21:28:15 GMT
Author: niq
Date: Mon Apr 14 14:28:15 2008
New Revision: 648007

URL: http://svn.apache.org/viewvc?rev=648007&view=rev
Log:
Backport fix to PR#42580 - return correct errno when poll interrupted

Modified:
    apr/apr/branches/1.2.x/CHANGES
    apr/apr/branches/1.2.x/poll/unix/port.c

Modified: apr/apr/branches/1.2.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/CHANGES?rev=648007&r1=648006&r2=648007&view=diff
==============================================================================
--- apr/apr/branches/1.2.x/CHANGES [utf-8] (original)
+++ apr/apr/branches/1.2.x/CHANGES [utf-8] Mon Apr 14 14:28:15 2008
@@ -1,6 +1,9 @@
                                                      -*- coding: utf-8 -*-
 Changes for APR 1.2.13
 
+  *) Fix return value when apr_pollset_poll interrupted.
+     PR 42580 [Basant Kumar Kukreja <basant.kukreja sun.com>]
+
   *) z/OS: return standard apr_status_t codes from apr_dso_load()
      and apr_dso_sym().  [David Jones <oscaremma gmail.com>]
 

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=648007&r1=648006&r2=648007&view=diff
==============================================================================
--- apr/apr/branches/1.2.x/poll/unix/port.c (original)
+++ apr/apr/branches/1.2.x/poll/unix/port.c Mon Apr 14 14:28:15 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