On systems without poll, limit apr_pollset's capacity to

the number of descriptors that select can handle
(this is why testpoll test #4 was failing on win32)


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

1 files changed, 6 insertions, 0 deletions

diff --git a/poll/unix/poll.c b/poll/unix/poll.c
index 58c520147..969726ddd 100644
--- a/poll/unix/poll.c
+++ b/poll/unix/poll.c
@@ -325,6 +325,12 @@ APR_DECLARE(apr_status_t) apr_pollset_create(apr_pollset_t **pollset,
                                              apr_uint32_t size,
                                              apr_pool_t *p)
 {
+#if !defined(HAVE_POLL) && defined(FD_SETSIZE)
+    if (size > FD_SETSIZE) {
+        *pollset = NULL;
+        return APR_EINVAL;
+    }
+#endif
     *pollset = apr_palloc(p, sizeof(**pollset));
     (*pollset)->nelts = 0;
     (*pollset)->nalloc = size;