diff options
| author | Pierrick Charron <pierrick@php.net> | 2012-09-28 15:21:33 -0400 |
|---|---|---|
| committer | Pierrick Charron <pierrick@php.net> | 2012-09-28 15:21:33 -0400 |
| commit | a2a82201277259a50f064c5b46983cf99e974198 (patch) | |
| tree | 35f57c00ecab4a035d6d9a473a8036a9d815cc44 | |
| parent | 34c3985979cb27cd1fff1ca767b3162357da7b0b (diff) | |
| parent | 936553d666405bc783511979b17d78d51905b9cd (diff) | |
| download | php-git-a2a82201277259a50f064c5b46983cf99e974198.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
FD_ZERO file descriptors before calling curl_multi_fdset
| -rw-r--r-- | ext/curl/streams.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/curl/streams.c b/ext/curl/streams.c index 19328d886c..821c2ecad8 100644 --- a/ext/curl/streams.c +++ b/ext/curl/streams.c @@ -162,6 +162,10 @@ static size_t php_curl_stream_read(php_stream *stream, char *buf, size_t count T } do { + FD_ZERO(&curlstream->readfds); + FD_ZERO(&curlstream->writefds); + FD_ZERO(&curlstream->excfds); + /* get the descriptors from curl */ curl_multi_fdset(curlstream->multi, &curlstream->readfds, &curlstream->writefds, &curlstream->excfds, &curlstream->maxfd); |