diff options
| author | Pierrick Charron <pierrick@php.net> | 2012-09-28 15:22:37 -0400 |
|---|---|---|
| committer | Pierrick Charron <pierrick@php.net> | 2012-09-28 15:22:37 -0400 |
| commit | 02bdf4c1fc9a996d0be4eccdcd1a03efc1af24b6 (patch) | |
| tree | 5365369a32f754315213a79d3496b00ce7be3818 /ext/curl | |
| parent | 5a385487c2dbf6a49b0edb140f9cb33c1f7299a1 (diff) | |
| parent | a2a82201277259a50f064c5b46983cf99e974198 (diff) | |
| download | php-git-02bdf4c1fc9a996d0be4eccdcd1a03efc1af24b6.tar.gz | |
Merge branch 'PHP-5.4'
* PHP-5.4:
FD_ZERO file descriptors before calling curl_multi_fdset
Diffstat (limited to 'ext/curl')
| -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); |