Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard streamsfuncs.c /ext/standard/tests/streams bug46426.phpt

2008-10-30 Thread Hannes Magnusson 
On Thu, Oct 30, 2008 at 11:09, Felipe Pena [EMAIL PROTECTED] wrote:
 felipe  Thu Oct 30 10:09:22 2008 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/streams bug46426.phpt

  Modified files:
/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/ext/standard/streamsfuncs.c?r1=1.58.2.6.2.15.2.24r2=1.58.2.6.2.15.2.25diff_format=u
 Index: php-src/ext/standard/streamsfuncs.c
 diff -u php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.24 
 php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.25
 --- php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.24  Sun Oct 26 
 13:25:06 2008
 +++ php-src/ext/standard/streamsfuncs.c Thu Oct 30 10:09:20 2008
 @@ -17,7 +17,7 @@
   +--+
  */

 -/* $Id: streamsfuncs.c,v 1.58.2.6.2.15.2.24 2008/10/26 13:25:06 felipe Exp $ 
 */
 +/* $Id: streamsfuncs.c,v 1.58.2.6.2.15.2.25 2008/10/30 10:09:20 felipe Exp $ 
 */

  #include php.h
  #include php_globals.h
 @@ -411,7 +411,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) {

Isn't this a change of behavior?

Passing no 3rd argument used to mean don't seek anywhere, just keep
the position as it is, but now means seek to the start of the
stream because pos = 0 by default...

-Hannes

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard streamsfuncs.c /ext/standard/tests/streams bug46426.phpt

2008-10-30 Thread Felipe Pena 
Em Qui, 2008-10-30 às 14:35 +0100, Hannes Magnusson escreveu:
 On Thu, Oct 30, 2008 at 11:09, Felipe Pena [EMAIL PROTECTED] wrote:
  felipe  Thu Oct 30 10:09:22 2008 UTC
 
   Added files: (Branch: PHP_5_3)
 /php-src/ext/standard/tests/streams bug46426.phpt
 
   Modified files:
 /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/ext/standard/streamsfuncs.c?r1=1.58.2.6.2.15.2.24r2=1.58.2.6.2.15.2.25diff_format=u
  Index: php-src/ext/standard/streamsfuncs.c
  diff -u php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.24 
  php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.25
  --- php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.24  Sun Oct 26 
  13:25:06 2008
  +++ php-src/ext/standard/streamsfuncs.c Thu Oct 30 10:09:20 2008
  @@ -17,7 +17,7 @@
+--+
   */
 
  -/* $Id: streamsfuncs.c,v 1.58.2.6.2.15.2.24 2008/10/26 13:25:06 felipe Exp 
  $ */
  +/* $Id: streamsfuncs.c,v 1.58.2.6.2.15.2.25 2008/10/30 10:09:20 felipe Exp 
  $ */
 
   #include php.h
   #include php_globals.h
  @@ -411,7 +411,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) {
 
 Isn't this a change of behavior?
 
 Passing no 3rd argument used to mean don't seek anywhere, just keep
 the position as it is, but now means seek to the start of the
 stream because pos = 0 by default...
 
 -Hannes
 

Opss, you are right. Thanks for noticing that.

.phpt++

-- 
Regards,
Felipe Pena


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php