dsp Mon Nov 24 15:37:34 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main/streams streams.c xp_socket.c
/php-src NEWS
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.30&r2=1.82.2.6.2.31&diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.82.2.6.2.30
php-src/main/streams/streams.c:1.82.2.6.2.31
--- php-src/main/streams/streams.c:1.82.2.6.2.30 Tue Nov 11 01:56:33 2008
+++ php-src/main/streams/streams.c Mon Nov 24 15:37:33 2008
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.82.2.6.2.30 2008/11/11 01:56:33 lbarnaud Exp $ */
+/* $Id: streams.c,v 1.82.2.6.2.31 2008/11/24 15:37:33 dsp Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -641,7 +641,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.11&r2=1.33.2.2.2.12&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.11
php-src/main/streams/xp_socket.c:1.33.2.2.2.12
--- php-src/main/streams/xp_socket.c:1.33.2.2.2.11 Wed Aug 27 07:48:37 2008
+++ php-src/main/streams/xp_socket.c Mon Nov 24 15:37:33 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xp_socket.c,v 1.33.2.2.2.11 2008/08/27 07:48:37 dsp Exp $ */
+/* $Id: xp_socket.c,v 1.33.2.2.2.12 2008/11/24 15:37:33 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;
}
}
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1327&r2=1.2027.2.547.2.1328&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1327 php-src/NEWS:1.2027.2.547.2.1328
--- php-src/NEWS:1.2027.2.547.2.1327 Mon Nov 24 12:49:00 2008
+++ php-src/NEWS Mon Nov 24 15:37:33 2008
@@ -269,7 +269,6 @@
overlapping needles). (Moriyoshi)
- Fixed Bug #43958 (class name added into the error message). (Dmitry)
- Fixed bug #43941 (json_encode silently cuts non-UTF8 strings). (Stas)
-- Fixed bug #43782 (feof() does not detect timeout on socket). (David Soria
Parra)
- Fixed bug #43668 (Added odbc.default_cursortype to control the ODBC
cursormodel). (Patrick)
- Fixed bug #43666 (Fixed code to use ODBC 3.52 datatypes for 64bit systems).
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
