diff options
| author | Gustavo André dos Santos Lopes <cataphract@php.net> | 2010-10-02 18:32:20 +0000 |
|---|---|---|
| committer | Gustavo André dos Santos Lopes <cataphract@php.net> | 2010-10-02 18:32:20 +0000 |
| commit | 4b0927b042a3b30f1dfad9ed89fe7e132ac8a040 (patch) | |
| tree | b11d99db86ee62137b3e509c1afd0c6655a25ba6 /main | |
| parent | 4d8503a2122ec7b3489878d09b17fb5f29bc92b0 (diff) | |
| download | php-git-4b0927b042a3b30f1dfad9ed89fe7e132ac8a040.tar.gz | |
- Fixed a small mistake in the fix for bug #50953 that made connection timeouts not be detected as such.
Diffstat (limited to 'main')
| -rw-r--r-- | main/network.c | 4 |
1 files 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) { |