You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by ni...@apache.org on 2008/06/27 19:49:47 UTC
svn commit: r672346 - /apr/apr/branches/1.2.x/poll/unix/port.c
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;