[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/file stat_variation8-win32.phpt
pajoye Wed Jul 8 09:59:33 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard/tests/filestat_variation8-win32.phpt Log: - fix test (mtime only is changed) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/stat_variation8-win32.phpt?r1=1.1.2.2.2.2&r2=1.1.2.2.2.3&diff_format=u Index: php-src/ext/standard/tests/file/stat_variation8-win32.phpt diff -u php-src/ext/standard/tests/file/stat_variation8-win32.phpt:1.1.2.2.2.2 php-src/ext/standard/tests/file/stat_variation8-win32.phpt:1.1.2.2.2.3 --- php-src/ext/standard/tests/file/stat_variation8-win32.phpt:1.1.2.2.2.2 Sun Aug 17 11:04:16 2008 +++ php-src/ext/standard/tests/file/stat_variation8-win32.phpt Wed Jul 8 09:59:33 2009 @@ -52,7 +52,7 @@ var_dump( compare_self_stat($new_stat) ); // compare the stat -$affected_members = array(7, 8, 9, 'size', 'atime', 'mtime'); +$affected_members = array(7, 9, 'size', 'mtime'); var_dump( compare_stats($old_stat, $new_stat, $affected_members, '!=') ); // clear the stat -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/file stat_variation8-win32.phpt
pajoye Wed Jul 8 10:00:45 2009 UTC Modified files: /php-src/ext/standard/tests/filestat_variation8-win32.phpt Log: - MF53: fix test (mtime only is changed) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/stat_variation8-win32.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/file/stat_variation8-win32.phpt diff -u php-src/ext/standard/tests/file/stat_variation8-win32.phpt:1.3 php-src/ext/standard/tests/file/stat_variation8-win32.phpt:1.4 --- php-src/ext/standard/tests/file/stat_variation8-win32.phpt:1.3 Sun Aug 17 11:10:52 2008 +++ php-src/ext/standard/tests/file/stat_variation8-win32.phpt Wed Jul 8 10:00:45 2009 @@ -52,7 +52,7 @@ var_dump( compare_self_stat($new_stat) ); // compare the stat -$affected_members = array(7, 8, 9, 'size', 'atime', 'mtime'); +$affected_members = array(7, 9, 'size', 'mtime'); var_dump( compare_stats($old_stat, $new_stat, $affected_members, '!=') ); // clear the stat -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/file rename_variation6.phpt
pajoye Wed Jul 8 10:13:27 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard/tests/filerename_variation6.phpt Log: - skip on win, different error msg http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/rename_variation6.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u Index: php-src/ext/standard/tests/file/rename_variation6.phpt diff -u php-src/ext/standard/tests/file/rename_variation6.phpt:1.1.2.2 php-src/ext/standard/tests/file/rename_variation6.phpt:1.1.2.2.2.1 --- php-src/ext/standard/tests/file/rename_variation6.phpt:1.1.2.2 Mon Jul 23 09:14:34 2007 +++ php-src/ext/standard/tests/file/rename_variation6.phpt Wed Jul 8 10:13:27 2009 @@ -1,7 +1,8 @@ --TEST-- -Test rename() function: usage variations-7 +Test rename() function: usage variations-6 --SKIPIF-- --FILE-- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/file rename_variation6.phpt
pajoye Wed Jul 8 10:14:14 2009 UTC Modified files: /php-src/ext/standard/tests/filerename_variation6.phpt Log: - MF53: skip on win, different error msg http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/rename_variation6.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/file/rename_variation6.phpt diff -u php-src/ext/standard/tests/file/rename_variation6.phpt:1.2 php-src/ext/standard/tests/file/rename_variation6.phpt:1.3 --- php-src/ext/standard/tests/file/rename_variation6.phpt:1.2 Tue May 27 09:34:54 2008 +++ php-src/ext/standard/tests/file/rename_variation6.phpt Wed Jul 8 10:14:14 2009 @@ -2,6 +2,7 @@ Test rename() function: usage variations-7 --SKIPIF-- --FILE-- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/file rename_variation6-win32.phpt
pajoye Wed Jul 8 10:14:49 2009 UTC Added files: (Branch: PHP_5_3) /php-src/ext/standard/tests/filerename_variation6-win32.phpt Log: - windows version http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/rename_variation6-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/rename_variation6-win32.phpt +++ php-src/ext/standard/tests/file/rename_variation6-win32.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/file rename_variation6-win32.phpt
pajoye Wed Jul 8 10:15:52 2009 UTC Modified files: /php-src/ext/standard/tests/filerename_variation6-win32.phpt Log: - windows version http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/rename_variation6-win32.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/file/rename_variation6-win32.phpt diff -u /dev/null php-src/ext/standard/tests/file/rename_variation6-win32.phpt:1.2 --- /dev/null Wed Jul 8 10:15:52 2009 +++ php-src/ext/standard/tests/file/rename_variation6-win32.phptWed Jul 8 10:15:52 2009 @@ -0,0 +1,36 @@ +--TEST-- +Test rename() function: usage variations-6 +--SKIPIF-- + +--FILE-- + +--EXPECTF-- +Warning: readlink(): Could not open file (error 2) in %s on line %d +bool(false) +string(%d) "%srename_variation6-win32.php.tmp" +bool(true) +Done -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /QA QATESTS.tgz README
zoe Wed Jul 8 10:25:58 2009 UTC Modified files: /phpruntests/QA QATESTS.tgz README Log: fixed tests http://cvs.php.net/viewvc.cgi/phpruntests/QA/QATESTS.tgz?r1=1.1&r2=1.2&diff_format=u Index: phpruntests/QA/QATESTS.tgz http://cvs.php.net/viewvc.cgi/phpruntests/QA/README?r1=1.4&r2=1.5&diff_format=u Index: phpruntests/QA/README diff -u phpruntests/QA/README:1.4 phpruntests/QA/README:1.5 --- phpruntests/QA/README:1.4 Tue Jul 7 17:18:12 2009 +++ phpruntests/QA/README Wed Jul 8 10:25:57 2009 @@ -5,9 +5,12 @@ 2) Run the new run tests with flags -o csv against the QA directory, eg run-tests.php -o csv -s phprt_out QA -3) Run the old run-tests.php against the QA directory and redirect the output to a file called rt_out +3) cd to teh QA directory and run all teh tests like this: +php run-tests.php Zend ext sapi tests > rt_out +It's no good trying to run all the tests by just giving run-tests the top level directory name, +the PDO tests fail if you do. -4) compare teh reulsts using +4) Compare the reulsts using php compareNewOld.php phprt_out rt_out QA -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /QA BaseNewOldComparison_08072009
zoe Wed Jul 8 10:35:43 2009 UTC Added files: /phpruntests/QA BaseNewOldComparison_08072009 Log: Base comparison of esults -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/file rename_variation7-win32.phpt
pajoye Wed Jul 8 10:41:50 2009 UTC Added files: (Branch: PHP_5_3) /php-src/ext/standard/tests/filerename_variation7-win32.phpt Log: - windows version http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/rename_variation7-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/rename_variation7-win32.phpt +++ php-src/ext/standard/tests/file/rename_variation7-win32.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/file rename_variation7.phpt
pajoye Wed Jul 8 10:42:07 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard/tests/filerename_variation7.phpt Log: - skip on windows http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/rename_variation7.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u Index: php-src/ext/standard/tests/file/rename_variation7.phpt diff -u php-src/ext/standard/tests/file/rename_variation7.phpt:1.1.2.2 php-src/ext/standard/tests/file/rename_variation7.phpt:1.1.2.2.2.1 --- php-src/ext/standard/tests/file/rename_variation7.phpt:1.1.2.2 Mon Jul 23 09:14:34 2007 +++ php-src/ext/standard/tests/file/rename_variation7.phpt Wed Jul 8 10:42:06 2009 @@ -2,6 +2,7 @@ Test rename() function: usage variations-8 --SKIPIF-- --FILE-- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/file rename_variation7-win32.phpt
pajoye Wed Jul 8 10:43:32 2009 UTC Modified files: /php-src/ext/standard/tests/filerename_variation7-win32.phpt Log: - windows version http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/rename_variation7-win32.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/file/rename_variation7-win32.phpt diff -u /dev/null php-src/ext/standard/tests/file/rename_variation7-win32.phpt:1.2 --- /dev/null Wed Jul 8 10:43:32 2009 +++ php-src/ext/standard/tests/file/rename_variation7-win32.phptWed Jul 8 10:43:32 2009 @@ -0,0 +1,36 @@ +--TEST-- +Test rename() function: usage variations-8 +--SKIPIF-- + +--FILE-- + +--EXPECTF-- +Warning: symlink(): Could not fetch file information(error 2) in %s on line %d + +Warning: readlink(): Could not open file (error 2) in %s on line %d +bool(false) + +Warning: readlink(): Could not open file (error 2) in %s on line %d +bool(false) +Done -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/file rename_variation7.phpt
pajoye Wed Jul 8 10:44:29 2009 UTC Modified files: /php-src/ext/standard/tests/filerename_variation7.phpt Log: - skip on windows http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/rename_variation7.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/file/rename_variation7.phpt diff -u php-src/ext/standard/tests/file/rename_variation7.phpt:1.2 php-src/ext/standard/tests/file/rename_variation7.phpt:1.3 --- php-src/ext/standard/tests/file/rename_variation7.phpt:1.2 Tue May 27 09:34:54 2008 +++ php-src/ext/standard/tests/file/rename_variation7.phpt Wed Jul 8 10:44:29 2009 @@ -2,6 +2,7 @@ Test rename() function: usage variations-8 --SKIPIF-- --FILE-- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /QA compareNewNew.php
zoe Wed Jul 8 14:27:54 2009 UTC Added files: /phpruntests/QA compareNewNew.php Log: checker http://cvs.php.net/viewvc.cgi/phpruntests/QA/compareNewNew.php?view=markup&rev=1.1 Index: phpruntests/QA/compareNewNew.php +++ phpruntests/QA/compareNewNew.php $nmy tests $type in file 1 and do not $type in file 2\n"; foreach($only_my as $line) { echo "$line \n"; } $only_rt = array_diff($rt, $my); $nrt = count ($only_rt); echo "\n => $nrt tests $type in file2 and do not $type in file1\n"; foreach($only_rt as $line) { echo "$line\n"; } } function checkNotices($tests) { $warnCount = 0; $noticeCount = 0; $fatalCount = 0; foreach($tests as $test) { if(preg_match("/Warning/", $test)) { $warnCount++; } if(preg_match("/Notice/", $test)) { $noticeCount++; } if(preg_match("/Fatal/", $test)) { $fatalCount++; } } echo "Number of Warnings: $warnCount Number of Notices: $noticeCount Number of Fatal: $fatalCount\n"; } ?> -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard array.c /ext/standard/tests/array bug48854.phpt
felipe Wed Jul 8 18:21:13 2009 UTC Added files: /php-src/ext/standard/tests/array bug48854.phpt Modified files: /php-src/ext/standard array.c Log: - Fixed bug #48854 (array_merge_recursive modifies arrays after first one) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.478&r2=1.479&diff_format=u Index: php-src/ext/standard/array.c diff -u php-src/ext/standard/array.c:1.478 php-src/ext/standard/array.c:1.479 --- php-src/ext/standard/array.c:1.478 Fri May 15 17:02:34 2009 +++ php-src/ext/standard/array.cWed Jul 8 18:21:13 2009 @@ -21,7 +21,7 @@ +--+ */ -/* $Id: array.c,v 1.478 2009/05/15 17:02:34 moriyoshi Exp $ */ +/* $Id: array.c,v 1.479 2009/07/08 18:21:13 felipe Exp $ */ #include "php.h" #include "php_ini.h" @@ -2473,6 +2473,7 @@ array_init_size(return_value, init_size); for (i = 0; i < argc; i++) { + SEPARATE_ZVAL(args[i]); if (!replace) { php_array_merge(Z_ARRVAL_P(return_value), Z_ARRVAL_PP(args[i]), recursive TSRMLS_CC); } else if (recursive && i > 0) { /* First array will be copied directly instead */ http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/bug48854.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/array/bug48854.phpt +++ php-src/ext/standard/tests/array/bug48854.phpt --TEST-- Bug #48854 (array_merge_recursive modifies arrays after first one) --FILE-- 5, 'children' => array( 'dogs' => 0, ), ); $array2 = array( 'friends' => 10, 'children' => array( 'cats' => 5, ), ); $merged = array_merge_recursive($array1, $array2); var_dump($array1, $array2); ?> --EXPECTF-- array(2) { [%u|b%"friends"]=> int(5) [%u|b%"children"]=> array(1) { [%u|b%"dogs"]=> int(0) } } array(2) { [%u|b%"friends"]=> int(10) [%u|b%"children"]=> array(1) { [%u|b%"cats"]=> int(5) } } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/standard array.c /ext/standard/tests/array bug48854.phpt
felipe Wed Jul 8 18:23:08 2009 UTC Added files: (Branch: PHP_5_3) /php-src/ext/standard/tests/array bug48854.phpt Modified files: /php-src/ext/standard array.c /php-srcNEWS Log: - MFH: Fixed bug #48854 (array_merge_recursive modifies arrays after first one) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.37.2.56&r2=1.308.2.21.2.37.2.57&diff_format=u Index: php-src/ext/standard/array.c diff -u php-src/ext/standard/array.c:1.308.2.21.2.37.2.56 php-src/ext/standard/array.c:1.308.2.21.2.37.2.57 --- php-src/ext/standard/array.c:1.308.2.21.2.37.2.56 Fri May 15 17:03:03 2009 +++ php-src/ext/standard/array.cWed Jul 8 18:23:07 2009 @@ -21,7 +21,7 @@ +--+ */ -/* $Id: array.c,v 1.308.2.21.2.37.2.56 2009/05/15 17:03:03 moriyoshi Exp $ */ +/* $Id: array.c,v 1.308.2.21.2.37.2.57 2009/07/08 18:23:07 felipe Exp $ */ #include "php.h" #include "php_ini.h" @@ -2305,6 +2305,7 @@ array_init_size(return_value, init_size); for (i = 0; i < argc; i++) { + SEPARATE_ZVAL(args[i]); if (!replace) { php_array_merge(Z_ARRVAL_P(return_value), Z_ARRVAL_PP(args[i]), recursive TSRMLS_CC); } else if (recursive && i > 0) { /* First array will be copied directly instead */ http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.671&r2=1.2027.2.547.2.965.2.672&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.671 php-src/NEWS:1.2027.2.547.2.965.2.672 --- php-src/NEWS:1.2027.2.547.2.965.2.671 Wed Jul 8 03:06:59 2009 +++ php-src/NEWSWed Jul 8 18:23:08 2009 @@ -4,6 +4,8 @@ - Fixed spl_autoload_unregister/spl_autoad_functions wrt. Closures and Functors. (Christian Seiler) +- Fixed bug #48854 (array_merge_recursive modifies arrays after first one). + (Felipe) - Fixed bug #48788 (RecursiveDirectoryIterator doesn't descend into symlinked directories). (Ilia) - Fixed bug #48771 (rename() between volumes fails and reports no error on http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/bug48854.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/array/bug48854.phpt +++ php-src/ext/standard/tests/array/bug48854.phpt --TEST-- Bug #48854 (array_merge_recursive modifies arrays after first one) --FILE-- 5, 'children' => array( 'dogs' => 0, ), ); $array2 = array( 'friends' => 10, 'children' => array( 'cats' => 5, ), ); $merged = array_merge_recursive($array1, $array2); var_dump($array1, $array2); ?> --EXPECTF-- array(2) { [%u|b%"friends"]=> int(5) [%u|b%"children"]=> array(1) { [%u|b%"dogs"]=> int(0) } } array(2) { [%u|b%"friends"]=> int(10) [%u|b%"children"]=> array(1) { [%u|b%"cats"]=> int(5) } } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/taskScheduler rtTaskSchedulerFile.php
g2 Wed Jul 8 19:35:39 2009 UTC Modified files: /phpruntests/src/taskScheduler rtTaskSchedulerFile.php Log: phpruntests - minor bugfix taskScheduler http://cvs.php.net/viewvc.cgi/phpruntests/src/taskScheduler/rtTaskSchedulerFile.php?r1=1.6&r2=1.7&diff_format=u Index: phpruntests/src/taskScheduler/rtTaskSchedulerFile.php diff -u phpruntests/src/taskScheduler/rtTaskSchedulerFile.php:1.6 phpruntests/src/taskScheduler/rtTaskSchedulerFile.php:1.7 --- phpruntests/src/taskScheduler/rtTaskSchedulerFile.php:1.6 Wed Jul 8 19:23:23 2009 +++ phpruntests/src/taskScheduler/rtTaskSchedulerFile.php Wed Jul 8 19:35:39 2009 @@ -116,9 +116,10 @@ // register signal-handler + /* pcntl_signal(SIGINT, "rtTaskSchedulerFile::signalHandler"); pcntl_signal(SIGQUIT, "rtTaskSchedulerFile::signalHandler"); - + */ // wait until all child-processes are terminated for ($i=0; $i<$this->processCount; $i++) { -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src rtClassMap.php rtException.php /src/taskScheduler rtTaskSchedulerFile.php /src/testcase rtPhpRunner.php /src/testcase/sections/executablesections rtCleanSection.php
g2 Wed Jul 8 19:23:23 2009 UTC Added files: /phpruntests/srcrtException.php Modified files: /phpruntests/srcrtClassMap.php /phpruntests/src/testcase/sections/executablesections rtCleanSection.php rtFileSection.php rtSkipIfSection.php /phpruntests/src/testcase rtPhpRunner.php /phpruntests/src/taskScheduler rtTaskSchedulerFile.php Log: phpruntests - moved rtException in root, replaced PhpRunnerException - added singal-handler to taskSchedulerFile http://cvs.php.net/viewvc.cgi/phpruntests/src/rtClassMap.php?r1=1.15&r2=1.16&diff_format=u Index: phpruntests/src/rtClassMap.php diff -u phpruntests/src/rtClassMap.php:1.15 phpruntests/src/rtClassMap.php:1.16 --- phpruntests/src/rtClassMap.php:1.15 Sun Jun 28 09:47:37 2009 +++ phpruntests/src/rtClassMap.php Wed Jul 8 19:23:23 2009 @@ -8,7 +8,6 @@ */ $rtClassMap = array( 'rtEnvironmentException' => 'configuration/exceptions/rtEnvironmentException.php', -'rtException' => 'configuration/exceptions/rtException.php', 'rtMissingArgumentException' => 'configuration/exceptions/rtMissingArgumentException.php', 'rtUnknownIniSettingException' => 'configuration/exceptions/rtUnknownIniSettingException.php', 'rtUnknownOptionException' => 'configuration/exceptions/rtUnknownOptionException.php', @@ -46,6 +45,7 @@ 'rtAutoload' => 'rtAutoload.php', 'rtClassMap' => 'rtClassMap.php', 'rtDirectoryList' => 'rtDirectoryList.php', +'rtException' => 'rtException.php', 'rtPhptFilterIterator' => 'rtPhptFilterIterator.php', 'rtText' => 'rtText.php', 'rtUtil' => 'rtUtil.php', @@ -55,7 +55,6 @@ 'rtTaskSchedulerFile' => 'taskScheduler/rtTaskSchedulerFile.php', 'rtTaskSchedulerMsgQ' => 'taskScheduler/rtTaskSchedulerMsgQ.php', 'rtTaskTestGroup' => 'taskScheduler/rtTaskTestGroup.php', -'rtCodeRunnerException'=> 'testcase/exceptions/rtCodeRunnerException.php', 'rtPhpRunnerException' => 'testcase/exceptions/rtPhpRunnerException.php', 'rtTestOutputWriterCSV'=> 'testcase/output/rtTestOutputWriterCSV.php', 'rtTestOutputWriterList' => 'testcase/output/rtTestOutputWriterList.php', http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/sections/executablesections/rtCleanSection.php?r1=1.5&r2=1.6&diff_format=u Index: phpruntests/src/testcase/sections/executablesections/rtCleanSection.php diff -u phpruntests/src/testcase/sections/executablesections/rtCleanSection.php:1.5 phpruntests/src/testcase/sections/executablesections/rtCleanSection.php:1.6 --- phpruntests/src/testcase/sections/executablesections/rtCleanSection.php:1.5 Tue Jun 2 19:12:08 2009 +++ phpruntests/src/testcase/sections/executablesections/rtCleanSection.php Wed Jul 8 19:23:23 2009 @@ -43,7 +43,7 @@ $testStatus->setMessage('fail_clean','Execution of clean section failed: '.trim($this->output) ); } -} catch (rtPhpRunnerException $e) { +} catch (rtException $e) { $testStatus->setTrue('fail_clean'); $testStatus->setMessage('fail_clean',$e->getMessage); } http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/sections/executablesections/rtFileSection.php?r1=1.13&r2=1.14&diff_format=u Index: phpruntests/src/testcase/sections/executablesections/rtFileSection.php diff -u phpruntests/src/testcase/sections/executablesections/rtFileSection.php:1.13 phpruntests/src/testcase/sections/executablesections/rtFileSection.php:1.14 --- phpruntests/src/testcase/sections/executablesections/rtFileSection.php:1.13 Tue Jun 2 19:12:08 2009 +++ phpruntests/src/testcase/sections/executablesections/rtFileSection.php Wed Jul 8 19:23:23 2009 @@ -67,7 +67,7 @@ } -} catch (rtPhpRunnerException $e) { +} catch (rtException $e) { $testStatus->setTrue('fail'); $testStatus->setMessage('fail', $e->getMessage() ); } http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/sections/executablesections/rtSkipIfSection.php?r1=1.5&r2=1.6&diff_format=u Index: phpruntests/src/testcase/sections/executablesections/rtSkipIfSection.php diff -u phpruntests/src/testcase/sections/executablesections/rtSkipIfSection.php:1.5 phpruntests/src/testcase/sections/executablesections/r
[PHP-CVS] cvs: php-src(PHP_5_3) /main main.c
stasThu Jul 9 00:21:18 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/main main.c Log: fix mail.log openbasedir interaction with .htaccess http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.57.2.56&r2=1.640.2.23.2.57.2.57&diff_format=u Index: php-src/main/main.c diff -u php-src/main/main.c:1.640.2.23.2.57.2.56 php-src/main/main.c:1.640.2.23.2.57.2.57 --- php-src/main/main.c:1.640.2.23.2.57.2.56Tue Jul 7 16:42:11 2009 +++ php-src/main/main.c Thu Jul 9 00:21:17 2009 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: main.c,v 1.640.2.23.2.57.2.56 2009/07/07 16:42:11 jani Exp $ */ +/* $Id: main.c,v 1.640.2.23.2.57.2.57 2009/07/09 00:21:17 stas Exp $ */ /* {{{ includes */ @@ -367,6 +367,26 @@ /* {{{ PHP_INI_MH */ +static PHP_INI_MH(OnUpdateMailLog) +{ + /* Only do the safemode/open_basedir check at runtime */ + if (stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS) { + if (PG(safe_mode) && (!php_checkuid(new_value, NULL, CHECKUID_CHECK_FILE_AND_DIR))) { + return FAILURE; + } + + if (PG(open_basedir) && php_check_open_basedir(new_value TSRMLS_CC)) { + return FAILURE; + } + + } + OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); + return SUCCESS; +} +/* }}} */ + +/* {{{ PHP_INI_MH + */ static PHP_INI_MH(OnChangeMailForceExtra) { /* Don't allow changing it in htaccess */ @@ -487,7 +507,7 @@ PHP_INI_ENTRY("SMTP", "localhost",PHP_INI_ALL,NULL) PHP_INI_ENTRY("smtp_port", "25", PHP_INI_ALL,NULL) STD_PHP_INI_BOOLEAN("mail.add_x_header","0", PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateBool, mail_x_header, php_core_globals, core_globals) - STD_PHP_INI_ENTRY("mail.log", NULL, PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateString, mail_log, php_core_globals, core_globals) + STD_PHP_INI_ENTRY("mail.log", NULL, PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateMailLog, mail_log, php_core_globals, core_globals) PHP_INI_ENTRY("browscap", NULL, PHP_INI_SYSTEM, NULL) PHP_INI_ENTRY("memory_limit", "128M", PHP_INI_ALL,OnChangeMemoryLimit) PHP_INI_ENTRY("precision", "14", PHP_INI_ALL,OnSetPrecision) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main main.c
stasThu Jul 9 00:24:26 2009 UTC Modified files: /php-src/main main.c Log: fix mail.log openbasedir interaction with .htaccess http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.803&r2=1.804&diff_format=u Index: php-src/main/main.c diff -u php-src/main/main.c:1.803 php-src/main/main.c:1.804 --- php-src/main/main.c:1.803 Tue Jul 7 16:40:21 2009 +++ php-src/main/main.c Thu Jul 9 00:24:26 2009 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: main.c,v 1.803 2009/07/07 16:40:21 jani Exp $ */ +/* $Id: main.c,v 1.804 2009/07/09 00:24:26 stas Exp $ */ /* {{{ includes */ @@ -482,6 +482,23 @@ /* {{{ PHP_INI_MH */ +static PHP_INI_MH(OnUpdateMailLog) +{ + /* Only do the safemode/open_basedir check at runtime */ + if (stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS) { + if (PG(open_basedir) && php_check_open_basedir(new_value TSRMLS_CC)) { + return FAILURE; + } + + } + OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); + return SUCCESS; +} +/* }}} */ + + +/* {{{ PHP_INI_MH + */ static PHP_INI_MH(OnChangeMailForceExtra) { /* Don't allow changing it in htaccess */ @@ -579,7 +596,7 @@ PHP_INI_ENTRY("SMTP", "localhost",PHP_INI_ALL,NULL) PHP_INI_ENTRY("smtp_port", "25", PHP_INI_ALL,NULL) STD_PHP_INI_BOOLEAN("mail.add_x_header","0", PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateBool, mail_x_header, php_core_globals, core_globals) - STD_PHP_INI_ENTRY("mail.log", NULL, PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateString, mail_log, php_core_globals, core_globals) + STD_PHP_INI_ENTRY("mail.log", NULL, PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateMailLog, mail_log, php_core_globals, core_globals) PHP_INI_ENTRY("browscap", NULL, PHP_INI_SYSTEM, NULL) PHP_INI_ENTRY("memory_limit", "128M", PHP_INI_ALL,OnChangeMemoryLimit) PHP_INI_ENTRY("precision", "14", PHP_INI_ALL,OnSetPrecision) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
stasThu Jul 9 00:27:29 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: report fix http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.672&r2=1.2027.2.547.2.965.2.673&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.672 php-src/NEWS:1.2027.2.547.2.965.2.673 --- php-src/NEWS:1.2027.2.547.2.965.2.672 Wed Jul 8 18:23:08 2009 +++ php-src/NEWSThu Jul 9 00:27:28 2009 @@ -3,6 +3,8 @@ ?? ??? 2009, PHP 5.3.1 - Fixed spl_autoload_unregister/spl_autoad_functions wrt. Closures and Functors. (Christian Seiler) +- Fixed open_basedir circumvention for mail.log. (Maksymilian Arciemowicz, + Stas) - Fixed bug #48854 (array_merge_recursive modifies arrays after first one). (Felipe) -- 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) / NEWS
pls add it to 5.2 NEWS too. Cheers, On Thu, Jul 9, 2009 at 2:27 AM, Stanislav Malyshev wrote: > stas Thu Jul 9 00:27:29 2009 UTC > > Modified files: (Branch: PHP_5_3) > /php-src NEWS > Log: > report fix > > > http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.672&r2=1.2027.2.547.2.965.2.673&diff_format=u > Index: php-src/NEWS > diff -u php-src/NEWS:1.2027.2.547.2.965.2.672 > php-src/NEWS:1.2027.2.547.2.965.2.673 > --- php-src/NEWS:1.2027.2.547.2.965.2.672 Wed Jul 8 18:23:08 2009 > +++ php-src/NEWS Thu Jul 9 00:27:28 2009 > @@ -3,6 +3,8 @@ > ?? ??? 2009, PHP 5.3.1 > - Fixed spl_autoload_unregister/spl_autoad_functions wrt. Closures and > Functors. (Christian Seiler) > +- Fixed open_basedir circumvention for mail.log. (Maksymilian Arciemowicz, > + Stas) > > - Fixed bug #48854 (array_merge_recursive modifies arrays after first one). > (Felipe) > > > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > > -- Pierre http://blog.thepimp.net | http://www.libgd.org -- 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) / NEWS
err, forget that :) On Thu, Jul 9, 2009 at 2:28 AM, Pierre Joye wrote: > pls add it to 5.2 NEWS too. > > Cheers, > > On Thu, Jul 9, 2009 at 2:27 AM, Stanislav Malyshev wrote: >> stas Thu Jul 9 00:27:29 2009 UTC >> >> Modified files: (Branch: PHP_5_3) >> /php-src NEWS >> Log: >> report fix >> >> >> http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.672&r2=1.2027.2.547.2.965.2.673&diff_format=u >> Index: php-src/NEWS >> diff -u php-src/NEWS:1.2027.2.547.2.965.2.672 >> php-src/NEWS:1.2027.2.547.2.965.2.673 >> --- php-src/NEWS:1.2027.2.547.2.965.2.672 Wed Jul 8 18:23:08 2009 >> +++ php-src/NEWS Thu Jul 9 00:27:28 2009 >> @@ -3,6 +3,8 @@ >> ?? ??? 2009, PHP 5.3.1 >> - Fixed spl_autoload_unregister/spl_autoad_functions wrt. Closures and >> Functors. (Christian Seiler) >> +- Fixed open_basedir circumvention for mail.log. (Maksymilian Arciemowicz, >> + Stas) >> >> - Fixed bug #48854 (array_merge_recursive modifies arrays after first one). >> (Felipe) >> >> >> >> -- >> PHP CVS Mailing List (http://www.php.net/) >> To unsubscribe, visit: http://www.php.net/unsub.php >> >> > > > > -- > Pierre > > http://blog.thepimp.net | http://www.libgd.org > -- Pierre http://blog.thepimp.net | http://www.libgd.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php