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

diff --git a/main/network.c b/main/network.c
index 02d323fce2fac24ccad276eaee327ca09a73817d..69a1d5e61b06a35a1f40d0c80b7d1fd3c94355b2 100644 (file)
--- 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) {