Merge branch 'PHP-5.3' into PHP-5.4

adoy · adoy · commit c8687ee63b0a · 2012-09-22T10:18:44.000-04:00
* PHP-5.3:
  Avoid calling select if maxfd returned by curl_multi_fdset is -1
diff --git a/ext/curl/multi.c b/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));
 }
 /* }}} */

Original file line number	Diff line number	Diff line change
`@@ -191,6 +191,9 @@ PHP_FUNCTION(curl_multi_select)`
`191`	`191`	`FD_ZERO(&exceptfds);`
`192`	`192`
`193`	`193`	`curl_multi_fdset(mh->multi, &readfds, &writefds, &exceptfds, &maxfd);`
	`194`	`+ if (maxfd == -1) {`
	`195`	`+ RETURN_LONG(-1);`
	`196`	`+ }`
`194`	`197`	`RETURN_LONG(select(maxfd + 1, &readfds, &writefds, &exceptfds, &to));`
`195`	`198`	`}`
`196`	`199`	`/* }}} */`