jani Thu Jul 12 11:03:46 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/file bug41815.phpt
Modified files:
/php-src NEWS
/php-src/main/streams plain_wrapper.c
Log:
MFH: - Fixed bug #41815 (Concurrent read/write fails when EOF is reached)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.830&r2=1.2027.2.547.2.831&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.830 php-src/NEWS:1.2027.2.547.2.831
--- php-src/NEWS:1.2027.2.547.2.830 Thu Jul 12 10:32:09 2007
+++ php-src/NEWS Thu Jul 12 11:03:45 2007
@@ -18,6 +18,7 @@
(Dmitry, Andrei Nigmatulin)
- Changed mail() function to be always available. (Johannes)
+- Added check for unknown options passed to configure. (Jani)
- Added persistent connection status checker to pdo_pgsql.
(Elvis Pranskevichus, Ilia)
- Added support for ATTR_TIMEOUT inside pdo_pgsql driver. (Ilia)
@@ -74,6 +75,7 @@
a node's siblings). (Rob)
- Fixed bug #41845 (pgsql extension does not compile with PostgreSQL <7.4).
(Ilia)
+- Fixed bug #41815 (Concurrent read/write fails when EOF is reached). (Sascha)
- Fixed bug #41813 (segmentation fault when using string offset as an object).
(judas dot iscariote at gmail dot com, Tony)
- Fixed bug #41795 (checkdnsrr does not support DNS_TXT type).
http://cvs.php.net/viewvc.cgi/php-src/main/streams/plain_wrapper.c?r1=1.52.2.6.2.21&r2=1.52.2.6.2.22&diff_format=u
Index: php-src/main/streams/plain_wrapper.c
diff -u php-src/main/streams/plain_wrapper.c:1.52.2.6.2.21
php-src/main/streams/plain_wrapper.c:1.52.2.6.2.22
--- php-src/main/streams/plain_wrapper.c:1.52.2.6.2.21 Wed Apr 18 14:23:06 2007
+++ php-src/main/streams/plain_wrapper.c Thu Jul 12 11:03:46 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: plain_wrapper.c,v 1.52.2.6.2.21 2007/04/18 14:23:06 dmitry Exp $ */
+/* $Id: plain_wrapper.c,v 1.52.2.6.2.22 2007/07/12 11:03:46 jani Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -329,9 +329,6 @@
assert(data != NULL);
if (data->fd >= 0) {
- if (stream->eof && !data->is_pipe) {
- return 0;
- }
ret = read(data->fd, buf, count);
if (ret == (size_t)-1 && errno == EINTR) {
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug41815.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/file/bug41815.phpt
+++ php-src/ext/standard/tests/file/bug41815.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
