- Fixed a small mistake in the fix for bug #50953 that made connection timeouts not be detected as such.

This commit is contained in:
Gustavo André dos Santos Lopes 2010-10-02 18:32:20 +00:00
parent d3b6fbe39b
commit 00f75c79ca

View File

@ -342,14 +342,14 @@ PHPAPI int php_network_connect_socket(php_socket_t sockfd,
* the select function reports success in the writefds set and failure in
* the exceptfds set. Indeed, using PHP_POLLREADABLE results in select
* failing only due to the timeout and not immediately as would be
* exepected when a connection is actively refused. This way,
* expected when a connection is actively refused. This way,
* php_pollfd_for will return a mask with POLLOUT if the connection
* is successful and with POLLPRI otherwise. */
if ((n = php_pollfd_for(sockfd, POLLOUT|POLLPRI, timeout)) == 0) {
#else
if ((n = php_pollfd_for(sockfd, PHP_POLLREADABLE|POLLOUT, timeout)) == 0) {
error = PHP_TIMEOUT_ERROR_VALUE;
#endif
error = PHP_TIMEOUT_ERROR_VALUE;
}
if (n > 0) {