mirror of
https://github.com/php/php-src.git
synced 2024-09-22 10:27:25 +00:00
Merge branch 'PHP-5.4'
* PHP-5.4: Avoid calling select if maxfd returned by curl_multi_fdset is -1 Fixing NEWS file
This commit is contained in:
commit
6c135dff97
@ -191,6 +191,9 @@ PHP_FUNCTION(curl_multi_select)
|
|||||||
FD_ZERO(&exceptfds);
|
FD_ZERO(&exceptfds);
|
||||||
|
|
||||||
curl_multi_fdset(mh->multi, &readfds, &writefds, &exceptfds, &maxfd);
|
curl_multi_fdset(mh->multi, &readfds, &writefds, &exceptfds, &maxfd);
|
||||||
|
if (maxfd == -1) {
|
||||||
|
RETURN_LONG(-1);
|
||||||
|
}
|
||||||
RETURN_LONG(select(maxfd + 1, &readfds, &writefds, &exceptfds, &to));
|
RETURN_LONG(select(maxfd + 1, &readfds, &writefds, &exceptfds, &to));
|
||||||
}
|
}
|
||||||
/* }}} */
|
/* }}} */
|
||||||
|
Loading…
Reference in New Issue
Block a user