dsp Mon Nov 24 15:35:03 2008 UTC
Modified files:
/php-src/main/streams streams.c xp_socket.c
Log:
Revert fix for 43782, as it caused problems.
[DOC] We better document the issue at it is.
http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.174&r2=1.175&diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.174
php-src/main/streams/streams.c:1.175
--- php-src/main/streams/streams.c:1.174 Tue Nov 11 01:55:19 2008
+++ php-src/main/streams/streams.c Mon Nov 24 15:35:03 2008
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.174 2008/11/11 01:55:19 lbarnaud Exp $ */
+/* $Id: streams.c,v 1.175 2008/11/24 15:35:03 dsp Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -840,7 +840,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.48&r2=1.49&diff_format=u
Index: php-src/main/streams/xp_socket.c
diff -u php-src/main/streams/xp_socket.c:1.48
php-src/main/streams/xp_socket.c:1.49
--- php-src/main/streams/xp_socket.c:1.48 Tue Aug 26 16:06:23 2008
+++ php-src/main/streams/xp_socket.c Mon Nov 24 15:35:03 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xp_socket.c,v 1.48 2008/08/26 16:06:23 dsp Exp $ */
+/* $Id: xp_socket.c,v 1.49 2008/11/24 15:35:03 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
