From 6d30f8ebed34e7276c2a59ee20d466bff17fee56 Mon Sep 17 00:00:00 2001 From: Evgeny Turnaev Date: Thu, 18 Jul 2013 00:06:09 +0200 Subject: curl_multi_wait: set revents for extra fds Pass back the revents that happened for the user-provided file descriptors. --- lib/multi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/multi.c b/lib/multi.c index 09a5b2d8b..dee2356ca 100644 --- a/lib/multi.c +++ b/lib/multi.c @@ -808,7 +808,7 @@ CURLMcode curl_multi_wait(CURLM *multi_handle, struct Curl_one_easy *easy; curl_socket_t sockbunch[MAX_SOCKSPEREASYHANDLE]; int bitmap; - unsigned int i; + unsigned int i, j; unsigned int nfds = 0; unsigned int curlfds; struct pollfd *ufds = NULL; @@ -910,6 +910,9 @@ CURLMcode curl_multi_wait(CURLM *multi_handle, else i = 0; + for(j = nfds - extra_nfds; j < nfds; j++) + extra_fds[j].revents = ufds[j].revents; + Curl_safefree(ufds); if(ret) *ret = i; -- cgit v1.2.3