lbarnaud Tue Nov 11 01:56:34 2008 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/streams stream_get_contents_002.phpt
Modified files:
/php-src/main/streams streams.c
/php-src NEWS
Log:
MFH: Fixed stream_get_contents() when using $maxlength and socket is not
closed. [EMAIL PROTECTED] on #46049.
http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.82.2.6.2.29&r2=1.82.2.6.2.30&diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.82.2.6.2.29
php-src/main/streams/streams.c:1.82.2.6.2.30
--- php-src/main/streams/streams.c:1.82.2.6.2.29 Tue Nov 4 17:07:20 2008
+++ php-src/main/streams/streams.c Tue Nov 11 01:56:33 2008
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.82.2.6.2.29 2008/11/04 17:07:20 lbarnaud Exp $ */
+/* $Id: streams.c,v 1.82.2.6.2.30 2008/11/11 01:56:33 lbarnaud Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -1234,7 +1234,7 @@
if (maxlen > 0) {
ptr = *buf = pemalloc_rel_orig(maxlen + 1, persistent);
- while ((len < maxlen) & !php_stream_eof(src)) {
+ while ((len < maxlen) && !php_stream_eof(src)) {
ret = php_stream_read(src, ptr, maxlen - len);
len += ret;
ptr += ret;
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1310&r2=1.2027.2.547.2.1311&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1310 php-src/NEWS:1.2027.2.547.2.1311
--- php-src/NEWS:1.2027.2.547.2.1310 Tue Nov 11 00:45:36 2008
+++ php-src/NEWS Tue Nov 11 01:56:33 2008
@@ -9,6 +9,9 @@
- Fixed bug #44818 (php://memory writeable when opened read only). (Arnaud)
- Fixed bug #30312 (sybase_unbuffered_query calls). (Timm)
+- Fixed stream_get_contents() when using $maxlength and socket is not
+ closed. [EMAIL PROTECTED] on #46049. (Arnaud)
+
06 Nov 2008, PHP 5.2.7RC3
- Added PHP_MAJOR_VERSION, PHP_MINOR_VERSION, PHP_RELEASE_VERSION,
PHP_EXTRA_VERSION, PHP_VERSION_ID, PHP_ZTS and PHP_DEBUG constants. (Pierre)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/streams/stream_get_contents_002.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/streams/stream_get_contents_002.phpt
+++ php-src/ext/standard/tests/streams/stream_get_contents_002.phpt
--TEST--
stream_get_contents() - Testing on socket with $maxlength
--SKIPIF--
<?php
if (substr(PHP_OS, 0, 3) == 'WIN') die("skip: non windows test");
?>
--FILE--
<?php
$sockets = stream_socket_pair(STREAM_PF_UNIX, STREAM_SOCK_STREAM, 0);
stream_set_timeout($sockets[1], 6000);
fwrite($sockets[0], b"foo");
var_dump(stream_get_contents($sockets[1], 3));
?>
--EXPECT--
string(3) "foo"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
