pajoye                                   Fri, 05 Feb 2010 00:39:31 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=294550

Log:
- Fixed bug #50657

Bug: http://bugs.php.net/50657 (Closed) copy() with an empty (zero-byte) HTTP 
source succeeds but returns false
      
Changed paths:
    _U  php/php-src/branches/PHP_5_3_2/
    _U  php/php-src/branches/PHP_5_3_2/ext/tidy/tests/
    U   php/php-src/branches/PHP_5_3_2/main/streams/streams.c
    _U  
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt


Property changes on: php/php-src/branches/PHP_5_3_2
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292716,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293735,293762,293768,293804,293815-293816,293862,293897,293901-293902,293906,293965,293974,293976,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294259,294267,294269,294272,294278,294285,294302-294304,294307,294310,294312-294313,294317,294320-294323,294333-294336,294418,294421,294487,294498,294532
/php/php-src/trunk:284726
   + 
/php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292716,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293175-293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293735,293762,293768,293804,293815-293816,293862,293897,293901-293902,293906,293965,293974,293976,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294259,294267,294269,294272,294278,294285,294302-294304,294307,294310,294312-294313,294317,294320-294323,294333-294336,294418,294421,294487,294498,294532
/php/php-src/trunk:284726


Property changes on: php/php-src/branches/PHP_5_3_2/ext/tidy/tests
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292716,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293735,293762,293768,293804,293815-293816,293862,293897,293901-293902,293906,293965,293976,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294259,294267,294269,294272,294278,294285,294302-294304,294307,294310,294312-294313,294317,294320-294323,294333-294336,294418,294421,294487,294498,294532
/php/php-src/trunk/ext/tidy/tests:29815-29816,284726,287798-287941
   + 
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292716,292719,292765,293146,293152,293175-293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293735,293762,293768,293804,293815-293816,293862,293897,293901-293902,293906,293965,293976,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294259,294267,294269,294272,294278,294285,294302-294304,294307,294310,294312-294313,294317,294320-294323,294333-294336,294418,294421,294487,294498,294532
/php/php-src/trunk/ext/tidy/tests:29815-29816,284726,287798-287941

Modified: php/php-src/branches/PHP_5_3_2/main/streams/streams.c
===================================================================
--- php/php-src/branches/PHP_5_3_2/main/streams/streams.c       2010-02-05 
00:37:07 UTC (rev 294549)
+++ php/php-src/branches/PHP_5_3_2/main/streams/streams.c       2010-02-05 
00:39:31 UTC (rev 294550)
@@ -1396,7 +1396,7 @@
        /* we've got at least 1 byte to read.
         * less than 1 is an error */

-       if (haveread > 0) {
+       if (haveread > 0 || src->eof) {
                return SUCCESS;
        }
        return FAILURE;


Property changes on: 
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,292716,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293735,293762,293768,293804,293815-293816,293862,293897,293901-293902,293906,293965,293976,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294259,294267,294269,294272,294278,294285,294302-294304,294307,294310,294312-294313,294317,294320-294323,294333-294336,294418,294421,294487,294498,294532
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:29815-29816,265951
   + 
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,292716,293146,293152,293175-293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293735,293762,293768,293804,293815-293816,293862,293897,293901-293902,293906,293965,293976,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294259,294267,294269,294272,294278,294285,294302-294304,294307,294310,294312-294313,294317,294320-294323,294333-294336,294418,294421,294487,294498,294532
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:29815-29816,265951

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

Reply via email to