dsp Mon Nov 24 15:36:47 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/main/streams streams.c xp_socket.c
Log:
MFH: Revert fix for 43782, as it caused problems.
http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.82.2.6.2.18.2.19&r2=1.82.2.6.2.18.2.20&diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.82.2.6.2.18.2.19
php-src/main/streams/streams.c:1.82.2.6.2.18.2.20
--- php-src/main/streams/streams.c:1.82.2.6.2.18.2.19 Tue Nov 11 01:55:51 2008
+++ php-src/main/streams/streams.c Mon Nov 24 15:36:47 2008
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.82.2.6.2.18.2.19 2008/11/11 01:55:51 lbarnaud Exp $ */
+/* $Id: streams.c,v 1.82.2.6.2.18.2.20 2008/11/24 15:36:47 dsp Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -650,7 +650,7 @@
/* use the configured timeout when checking eof */
if (!stream->eof && PHP_STREAM_OPTION_RETURN_ERR ==
php_stream_set_option(stream,
PHP_STREAM_OPTION_CHECK_LIVENESS,
- -1, NULL)) {
+ 0, NULL)) {
stream->eof = 1;
}
http://cvs.php.net/viewvc.cgi/php-src/main/streams/xp_socket.c?r1=1.33.2.2.2.6.2.6&r2=1.33.2.2.2.6.2.7&diff_format=u
Index: php-src/main/streams/xp_socket.c
diff -u php-src/main/streams/xp_socket.c:1.33.2.2.2.6.2.6
php-src/main/streams/xp_socket.c:1.33.2.2.2.6.2.7
--- php-src/main/streams/xp_socket.c:1.33.2.2.2.6.2.6 Tue Aug 26 16:06:36 2008
+++ php-src/main/streams/xp_socket.c Mon Nov 24 15:36:47 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xp_socket.c,v 1.33.2.2.2.6.2.6 2008/08/26 16:06:36 dsp Exp $ */
+/* $Id: xp_socket.c,v 1.33.2.2.2.6.2.7 2008/11/24 15:36:47 dsp Exp $ */
#include "php.h"
#include "ext/standard/file.h"
@@ -280,12 +280,8 @@
if (sock->socket == -1) {
alive = 0;
- } else {
- if (php_pollfd_for(sock->socket,
PHP_POLLREADABLE|POLLPRI, &tv) > 0) {
- if (0 == recv(sock->socket,
&buf, sizeof(buf), MSG_PEEK) && php_socket_errno() != EAGAIN) {
- alive = 0;
- }
- } else {
+ } else if (php_pollfd_for(sock->socket,
PHP_POLLREADABLE|POLLPRI, &tv) > 0) {
+ if (0 == recv(sock->socket, &buf,
sizeof(buf), MSG_PEEK) && php_socket_errno() != EAGAIN) {
alive = 0;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
