Merge branch 'PHP-5.3' into PHP-5.4

adoy · adoy · commit a2a822012772 · 2012-09-28T15:21:33.000-04:00
* PHP-5.3:
  FD_ZERO file descriptors before calling curl_multi_fdset
diff --git 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);
 

Original file line number	Diff line number	Diff line change
`@@ -162,6 +162,10 @@ static size_t php_curl_stream_read(php_stream stream, char buf, size_t count T`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`do {`
	`165`	`+ FD_ZERO(&curlstream->readfds);`
	`166`	`+ FD_ZERO(&curlstream->writefds);`
	`167`	`+ FD_ZERO(&curlstream->excfds);`
	`168`	`+`
`165`	`169`	`/* get the descriptors from curl */`
`166`	`170`	`curl_multi_fdset(curlstream->multi, &curlstream->readfds, &curlstream->writefds, &curlstream->excfds, &curlstream->maxfd);`
`167`	`171`