If APR_POLLSET_NODEFAULT is specified, never ever fallback to the default.

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@789066 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 6 insertions, 3 deletions

diff --git a/poll/unix/pollcb.c b/poll/unix/pollcb.c
index 9fbfbd61a..cd5266a7e 100644
--- a/poll/unix/pollcb.c
+++ b/poll/unix/pollcb.c
@@ -103,19 +103,22 @@ APR_DECLARE(apr_status_t) apr_pollcb_create_ex(apr_pollcb_t **pollcb,
 
     rv = (*provider->create)(*pollcb, size, p, flags);
     if (rv == APR_ENOTIMPL) {
+        *pollcb = NULL;
         if (method == pollset_default_method) {
-            *pollcb = NULL;
             return rv;
         }
+
+        if ((flags & APR_POLLSET_NODEFAULT) == APR_POLLSET_NODEFAULT) {
+            return rv;
+        }
+
         /* Try with default provider */
         provider = pollcb_provider(pollset_default_method);
         if (!provider) {
-            *pollcb = NULL;
             return APR_ENOTIMPL;
         }
         rv = (*provider->create)(*pollcb, size, p, flags);
         if (rv != APR_SUCCESS) {
-            *pollcb = NULL;
             return rv;
         }
         (*pollcb)->provider = provider;