felipe Thu Oct 30 10:11:52 2008 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/streams bug46426.phpt
Modified files:
/php-src NEWS
/php-src/ext/standard streamsfuncs.c
Log:
- MFH: Fixed bug #46426 (3rd parameter offset of stream_get_contents not
works for "0")
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1288&r2=1.2027.2.547.2.1289&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1288 php-src/NEWS:1.2027.2.547.2.1289
--- php-src/NEWS:1.2027.2.547.2.1288 Thu Oct 30 08:56:38 2008
+++ php-src/NEWS Thu Oct 30 10:11:51 2008
@@ -4,6 +4,8 @@
- Fixed ability to use "internal" heaps in extensions. (Arnaud, Dmitry)
- Updated timezone database to version 2008.9. (Derick)
+- Fixed bug #46426 (3rd parameter offset of stream_get_contents not works for
+ "0"). (Felipe)
- Fixed bug #46406 (Unregistering nodeclass throws E_FATAL). (Rob)
- Fixed bug #46389 (NetWare needs small patch for _timezone).
(patch by [EMAIL PROTECTED])
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.58.2.6.2.24&r2=1.58.2.6.2.25&diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.24
php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.25
--- php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.24 Sun Oct 26 13:48:15 2008
+++ php-src/ext/standard/streamsfuncs.c Thu Oct 30 10:11:51 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streamsfuncs.c,v 1.58.2.6.2.24 2008/10/26 13:48:15 felipe Exp $ */
+/* $Id: streamsfuncs.c,v 1.58.2.6.2.25 2008/10/30 10:11:51 felipe Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -406,7 +406,7 @@
php_stream_from_zval(stream, &zsrc);
- if (pos > 0 && php_stream_seek(stream, pos, SEEK_SET) < 0) {
+ if (pos >= 0 && php_stream_seek(stream, pos, SEEK_SET) < 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to seek to
position %ld in the stream", pos);
RETURN_FALSE;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/streams/bug46426.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/streams/bug46426.phpt
+++ php-src/ext/standard/tests/streams/bug46426.phpt
--TEST--
Bug #46426 (3rd parameter offset of stream_get_contents not works for "0")
--FILE--
<?php
$tmp = tmpfile();
fwrite($tmp, "12345");
echo stream_get_contents($tmp, -1, 0);
echo "\n";
echo stream_get_contents($tmp, -1, 1);
echo "\n";
echo stream_get_contents($tmp, -1, 2);
@unlink($tmp);
?>
--EXPECT--
12345
2345
345
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
