svn: /php/php-src/ branches/PHP_5_3/main/network.c trunk/main/network.c

cataphract Sat, 02 Oct 2010 18:32:20 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=303958 Log: - Fixed a small mistake in the fix for bug #50953 that made connection timeouts not be detected as such. Bug: http://bugs.php.net/50953 (Closed) fsockopen will not work on 'localhost' Changed paths: U php/php-src/branches/PHP_5_3/main/network.c U php/php-src/trunk/main/network.c Modified: php/php-src/branches/PHP_5_3/main/network.c =================================================================== --- php/php-src/branches/PHP_5_3/main/network.c 2010-10-02 17:00:49 UTC (rev 303957) +++ php/php-src/branches/PHP_5_3/main/network.c 2010-10-02 18:32:20 UTC (rev 303958) @@ -342,14 +342,14 @@ * 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) { +#endif error = PHP_TIMEOUT_ERROR_VALUE; -#endif } if (n > 0) { Modified: php/php-src/trunk/main/network.c =================================================================== --- php/php-src/trunk/main/network.c 2010-10-02 17:00:49 UTC (rev 303957) +++ php/php-src/trunk/main/network.c 2010-10-02 18:32:20 UTC (rev 303958) @@ -342,14 +342,14 @@ * 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) { +#endif error = PHP_TIMEOUT_ERROR_VALUE; -#endif } if (n > 0) {