Browse Source

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Avoid calling select if maxfd returned by curl_multi_fdset is -1
PHP-5.4.9
Pierrick Charron 13 years ago
parent
commit
c8687ee63b
  1. 3
      ext/curl/multi.c

3
ext/curl/multi.c

@ -191,6 +191,9 @@ PHP_FUNCTION(curl_multi_select)
FD_ZERO(&exceptfds);
curl_multi_fdset(mh->multi, &readfds, &writefds, &exceptfds, &maxfd);
if (maxfd == -1) {
RETURN_LONG(-1);
}
RETURN_LONG(select(maxfd + 1, &readfds, &writefds, &exceptfds, &to));
}
/* }}} */

Loading…
Cancel
Save