Merge branch 'PHP-5.4'

* PHP-5.4: Avoid calling select if maxfd returned by curl_multi_fdset is -1 Fixing NEWS file
php · Sep 22, 2012 · 6c135df · 6c135df
2 parents 70713a2 + c8687ee
commit 6c135df
Showing 1 changed file with 3 additions and 0 deletions.
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));
 }
 /* }}} */