diff options
| author | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2010-04-12 15:24:48 +0000 |
|---|---|---|
| committer | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2010-04-12 15:24:48 +0000 |
| commit | 0bb735aea9b8930d004a1d01e9d67c128040ad73 (patch) | |
| tree | 7b7bb455e8102691f5fcef0b30cdb87d7d641d2a /poll | |
| parent | 6226740fb5c35271a147d3c3a2e34996d31af8dd (diff) | |
| download | libapr-0bb735aea9b8930d004a1d01e9d67c128040ad73.tar.gz | |
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
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.4.x@933275 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'poll')
| -rw-r--r-- | poll/unix/pollset.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/poll/unix/pollset.c b/poll/unix/pollset.c index d796ce6b3..d9fb2d460 100644 --- a/poll/unix/pollset.c +++ b/poll/unix/pollset.c @@ -271,6 +271,9 @@ APR_DECLARE(apr_status_t) apr_pollset_create_ex(apr_pollset_t **ret_pollset, } 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) { |