You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by tr...@apache.org on 2009/08/20 16:15:05 UTC
svn commit: r806181 - in /apr/apr/branches/1.3.x: CHANGES poll/unix/port.c
Author: trawick
Date: Thu Aug 20 14:15:04 2009
New Revision: 806181
URL: http://svn.apache.org/viewvc?rev=806181&view=rev
Log:
merge r654046 from trunk/1.4.x
This is a follow-up patch for PR 43000 (r653953) which was
comitted to trunk but not 1.3.x back in May 2008.
Modified:
apr/apr/branches/1.3.x/CHANGES
apr/apr/branches/1.3.x/poll/unix/port.c
Modified: apr/apr/branches/1.3.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/CHANGES?rev=806181&r1=806180&r2=806181&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/CHANGES [utf-8] (original)
+++ apr/apr/branches/1.3.x/CHANGES [utf-8] Thu Aug 20 14:15:04 2009
@@ -1,7 +1,9 @@
-*- coding: utf-8 -*-
Changes for APR 1.3.9
-
+ *) Add the remainder of this fix from trunk:
+ Fix Solaris poll failure. PR 43000
+ [Henry Jen <henryjen ztune.net>]
Changes for APR 1.3.8
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=806181&r1=806180&r2=806181&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/poll/unix/port.c (original)
+++ apr/apr/branches/1.3.x/poll/unix/port.c Thu Aug 20 14:15:04 2009
@@ -242,6 +242,9 @@
APR_RING_REMOVE(ep, link);
APR_RING_INSERT_TAIL(&(pollset->dead_ring),
ep, pfd_elem_t, link);
+ if (ENOENT == err) {
+ rv = APR_SUCCESS;
+ }
break;
}
}