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 | 00f75c79ca9318cbd57590b4c01144369612b3c2 (patch) | |
| tree | 2694d1b3e4e29ae3d1191abf911259d2cc116888 /main/network.c | |
| parent | d3b6fbe39bc74920da5e73a546208252a01f9586 (diff) | |
| download | php-git-00f75c79ca9318cbd57590b4c01144369612b3c2.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/network.c')
| -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 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) { |