apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r933274 - /apr/apr/branches/1.5.x/poll/unix/pollset.c
Date Mon, 12 Apr 2010 15:19:43 GMT
Author: trawick
Date: Mon Apr 12 15:19:43 2010
New Revision: 933274

URL: http://svn.apache.org/viewvc?rev=933274&view=rev
Log:
Merge r933271 from trunk:

apr_pollset_create_ex(): Trap errors from pollset providers.

PR: 49094
Submitted by: Sami Tolvanen <sami.tolvanen mywot.com>
Reviewed by: trawick

Modified:
    apr/apr/branches/1.5.x/poll/unix/pollset.c

Modified: apr/apr/branches/1.5.x/poll/unix/pollset.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/poll/unix/pollset.c?rev=933274&r1=933273&r2=933274&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/poll/unix/pollset.c (original)
+++ apr/apr/branches/1.5.x/poll/unix/pollset.c Mon Apr 12 15:19:43 2010
@@ -271,6 +271,9 @@ APR_DECLARE(apr_status_t) apr_pollset_cr
         }
         pollset->provider = provider;
     }
+    else if (rv != APR_SUCCESS) {
+        return rv;
+    }
     if (flags & APR_POLLSET_WAKEABLE) {
         /* Create wakeup pipe */
         if ((rv = create_wakeup_pipe(pollset)) != APR_SUCCESS) {



Mime
View raw message