apr-commits mailing list archives

Author: niq
Date: Fri Jun 27 10:48:17 2008
New Revision: 672345

URL: http://svn.apache.org/viewvc?rev=672345&view=rev
Log:
Fix solaris poll bug - ref http://marc.info/?t=121438277000004&r=1&w=2

Modified:
    apr/apr/branches/1.3.x/poll/unix/port.c

Modified: apr/apr/branches/1.3.x/poll/unix/port.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/poll/unix/port.c?rev=672345&r1=672344&r2=672345&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/poll/unix/port.c (original)
+++ apr/apr/branches/1.3.x/poll/unix/port.c Fri Jun 27 10:48:17 2008
@@ -315,7 +315,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;