From: Gustavo André dos Santos Lopes <cataphract@php.net>
Date: Sat, 2 Oct 2010 18:32:20 +0000 (+0000)
Subject: - Fixed a small mistake in the fix for bug #50953 that made connection timeouts not... 
X-Git-Tag: php-5.4.0alpha1~191^2~865
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=00f75c79ca9318cbd57590b4c01144369612b3c2;p=php

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

diff --git a/main/network.c b/main/network.c
index 4c47305e98..cc546a7950 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) {