From 4b0927b042a3b30f1dfad9ed89fe7e132ac8a040 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Gustavo=20Andr=C3=A9=20dos=20Santos=20Lopes?= Date: Sat, 2 Oct 2010 18:32:20 +0000 Subject: [PATCH] - Fixed a small mistake in the fix for bug #50953 that made connection timeouts not be detected as such. --- main/network.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/network.c b/main/network.c index 02d323fce2..69a1d5e61b 100644 --- a/main/network.c +++ b/main/network.c @@ -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) { -- 2.40.0