[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/reflection/tests/009.phpt branches/PHP_5_4/ext/reflection/tests/009.phpt trunk/ext/reflection/tests/009.phpt
pajoye Tue, 06 Sep 2011 07:00:05 + Revision: http://svn.php.net/viewvc?view=revision&revision=316218 Log: - force LF Changed paths: _U php/php-src/branches/PHP_5_3/ext/reflection/tests/009.phpt _U php/php-src/branches/PHP_5_4/ext/reflection/tests/009.phpt _U php/php-src/trunk/ext/reflection/tests/009.phpt Property changes on: php/php-src/branches/PHP_5_3/ext/reflection/tests/009.phpt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/branches/PHP_5_4/ext/reflection/tests/009.phpt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/trunk/ext/reflection/tests/009.phpt ___ Modified: svn:eol-style - native + LF -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/reflection/tests/025.phpt branches/PHP_5_4/ext/reflection/tests/025.phpt trunk/ext/reflection/tests/025.phpt
pajoye Tue, 06 Sep 2011 07:03:48 + Revision: http://svn.php.net/viewvc?view=revision&revision=316219 Log: - force LF Changed paths: _U php/php-src/branches/PHP_5_3/ext/reflection/tests/025.phpt _U php/php-src/branches/PHP_5_4/ext/reflection/tests/025.phpt _U php/php-src/trunk/ext/reflection/tests/025.phpt Property changes on: php/php-src/branches/PHP_5_3/ext/reflection/tests/025.phpt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/branches/PHP_5_4/ext/reflection/tests/025.phpt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/trunk/ext/reflection/tests/025.phpt ___ Modified: svn:eol-style - native + LF -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/simplexml/tests/bug37076.phpt branches/PHP_5_3/ext/simplexml/tests/bug37076_1.phpt branches/PHP_5_4/ext/simplexml/tests/bug37076.phpt branches/PHP_5_4
pajoye Tue, 06 Sep 2011 07:09:56 + Revision: http://svn.php.net/viewvc?view=revision&revision=316222 Log: - add skipif Changed paths: U php/php-src/branches/PHP_5_3/ext/simplexml/tests/bug37076.phpt U php/php-src/branches/PHP_5_3/ext/simplexml/tests/bug37076_1.phpt U php/php-src/branches/PHP_5_4/ext/simplexml/tests/bug37076.phpt U php/php-src/branches/PHP_5_4/ext/simplexml/tests/bug37076_1.phpt U php/php-src/trunk/ext/simplexml/tests/bug37076.phpt U php/php-src/trunk/ext/simplexml/tests/bug37076_1.phpt Modified: php/php-src/branches/PHP_5_3/ext/simplexml/tests/bug37076.phpt === --- php/php-src/branches/PHP_5_3/ext/simplexml/tests/bug37076.phpt 2011-09-06 07:09:41 UTC (rev 316221) +++ php/php-src/branches/PHP_5_3/ext/simplexml/tests/bug37076.phpt 2011-09-06 07:09:56 UTC (rev 316222) @@ -1,5 +1,7 @@ --TEST-- Bug #37076 (SimpleXML ignores .=) +--SKIPIF-- + --FILE-- "); Modified: php/php-src/branches/PHP_5_3/ext/simplexml/tests/bug37076_1.phpt === --- php/php-src/branches/PHP_5_3/ext/simplexml/tests/bug37076_1.phpt 2011-09-06 07:09:41 UTC (rev 316221) +++ php/php-src/branches/PHP_5_3/ext/simplexml/tests/bug37076_1.phpt 2011-09-06 07:09:56 UTC (rev 316222) @@ -1,5 +1,7 @@ --TEST-- Bug #37076 (SimpleXML ignores .=) (appending to unnamed attribute) +--SKIPIF-- + --FILE-- "); Modified: php/php-src/branches/PHP_5_4/ext/simplexml/tests/bug37076.phpt === --- php/php-src/branches/PHP_5_4/ext/simplexml/tests/bug37076.phpt 2011-09-06 07:09:41 UTC (rev 316221) +++ php/php-src/branches/PHP_5_4/ext/simplexml/tests/bug37076.phpt 2011-09-06 07:09:56 UTC (rev 316222) @@ -1,5 +1,7 @@ --TEST-- Bug #37076 (SimpleXML ignores .=) +--SKIPIF-- + --FILE-- "); Modified: php/php-src/branches/PHP_5_4/ext/simplexml/tests/bug37076_1.phpt === --- php/php-src/branches/PHP_5_4/ext/simplexml/tests/bug37076_1.phpt 2011-09-06 07:09:41 UTC (rev 316221) +++ php/php-src/branches/PHP_5_4/ext/simplexml/tests/bug37076_1.phpt 2011-09-06 07:09:56 UTC (rev 316222) @@ -1,5 +1,7 @@ --TEST-- Bug #37076 (SimpleXML ignores .=) (appending to unnamed attribute) +--SKIPIF-- + --FILE-- "); Modified: php/php-src/trunk/ext/simplexml/tests/bug37076.phpt === --- php/php-src/trunk/ext/simplexml/tests/bug37076.phpt 2011-09-06 07:09:41 UTC (rev 316221) +++ php/php-src/trunk/ext/simplexml/tests/bug37076.phpt 2011-09-06 07:09:56 UTC (rev 316222) @@ -1,5 +1,7 @@ --TEST-- Bug #37076 (SimpleXML ignores .=) +--SKIPIF-- + --FILE-- "); Modified: php/php-src/trunk/ext/simplexml/tests/bug37076_1.phpt === --- php/php-src/trunk/ext/simplexml/tests/bug37076_1.phpt 2011-09-06 07:09:41 UTC (rev 316221) +++ php/php-src/trunk/ext/simplexml/tests/bug37076_1.phpt 2011-09-06 07:09:56 UTC (rev 316222) @@ -1,5 +1,7 @@ --TEST-- Bug #37076 (SimpleXML ignores .=) (appending to unnamed attribute) +--SKIPIF-- + --FILE-- "); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/spl/tests/DirectoryIterator_getExtension_basic.phpt branches/PHP_5_4/ext/spl/tests/DirectoryIterator_getExtension_basic.phpt trunk/ext/spl/tests/Direc
pajoye Tue, 06 Sep 2011 07:23:20 + Revision: http://svn.php.net/viewvc?view=revision&revision=316223 Log: - skip on win, name.. name. are not valid names Changed paths: U php/php-src/branches/PHP_5_3/ext/spl/tests/DirectoryIterator_getExtension_basic.phpt U php/php-src/branches/PHP_5_4/ext/spl/tests/DirectoryIterator_getExtension_basic.phpt U php/php-src/trunk/ext/spl/tests/DirectoryIterator_getExtension_basic.phpt Modified: php/php-src/branches/PHP_5_3/ext/spl/tests/DirectoryIterator_getExtension_basic.phpt === --- php/php-src/branches/PHP_5_3/ext/spl/tests/DirectoryIterator_getExtension_basic.phpt 2011-09-06 07:09:56 UTC (rev 316222) +++ php/php-src/branches/PHP_5_3/ext/spl/tests/DirectoryIterator_getExtension_basic.phpt 2011-09-06 07:23:20 UTC (rev 316223) @@ -1,5 +1,11 @@ --TEST-- SPL: DirectoryIterator::getExtension() basic test +--SKIPIF-- + --FILE-- --FILE-- --FILE-- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/spl/tests/DirectoryIterator_by_reference.phpt branches/PHP_5_4/ext/spl/tests/DirectoryIterator_by_reference.phpt trunk/ext/spl/tests/DirectoryIterator
pajoye Tue, 06 Sep 2011 07:26:05 + Revision: http://svn.php.net/viewvc?view=revision&revision=316224 Log: - use something we know it exists... Changed paths: U php/php-src/branches/PHP_5_3/ext/spl/tests/DirectoryIterator_by_reference.phpt U php/php-src/branches/PHP_5_4/ext/spl/tests/DirectoryIterator_by_reference.phpt U php/php-src/trunk/ext/spl/tests/DirectoryIterator_by_reference.phpt Modified: php/php-src/branches/PHP_5_3/ext/spl/tests/DirectoryIterator_by_reference.phpt === --- php/php-src/branches/PHP_5_3/ext/spl/tests/DirectoryIterator_by_reference.phpt 2011-09-06 07:23:20 UTC (rev 316223) +++ php/php-src/branches/PHP_5_3/ext/spl/tests/DirectoryIterator_by_reference.phpt 2011-09-06 07:26:05 UTC (rev 316224) @@ -5,10 +5,10 @@ #PHPTestFest2009 Norway 2009-06-09 \o/ --FILE-- --EXPECTF-- -Fatal error: An iterator cannot be used with foreach by reference in %s on line %d \ No newline at end of file +Fatal error: An iterator cannot be used with foreach by reference in %s on line %d Modified: php/php-src/branches/PHP_5_4/ext/spl/tests/DirectoryIterator_by_reference.phpt === --- php/php-src/branches/PHP_5_4/ext/spl/tests/DirectoryIterator_by_reference.phpt 2011-09-06 07:23:20 UTC (rev 316223) +++ php/php-src/branches/PHP_5_4/ext/spl/tests/DirectoryIterator_by_reference.phpt 2011-09-06 07:26:05 UTC (rev 316224) @@ -5,10 +5,10 @@ #PHPTestFest2009 Norway 2009-06-09 \o/ --FILE-- --EXPECTF-- -Fatal error: An iterator cannot be used with foreach by reference in %s on line %d \ No newline at end of file +Fatal error: An iterator cannot be used with foreach by reference in %s on line %d Modified: php/php-src/trunk/ext/spl/tests/DirectoryIterator_by_reference.phpt === --- php/php-src/trunk/ext/spl/tests/DirectoryIterator_by_reference.phpt 2011-09-06 07:23:20 UTC (rev 316223) +++ php/php-src/trunk/ext/spl/tests/DirectoryIterator_by_reference.phpt 2011-09-06 07:26:05 UTC (rev 316224) @@ -5,10 +5,10 @@ #PHPTestFest2009 Norway 2009-06-09 \o/ --FILE-- --EXPECTF-- -Fatal error: An iterator cannot be used with foreach by reference in %s on line %d \ No newline at end of file +Fatal error: An iterator cannot be used with foreach by reference in %s on line %d -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/sqlite3/tests/bug53463.phpt branches/PHP_5_4/ext/sqlite3/tests/bug53463.phpt trunk/ext/sqlite3/tests/bug53463.phpt
pajoye Tue, 06 Sep 2011 07:28:38 + Revision: http://svn.php.net/viewvc?view=revision&revision=316225 Log: - add skipif Changed paths: U php/php-src/branches/PHP_5_3/ext/sqlite3/tests/bug53463.phpt U php/php-src/branches/PHP_5_4/ext/sqlite3/tests/bug53463.phpt U php/php-src/trunk/ext/sqlite3/tests/bug53463.phpt Modified: php/php-src/branches/PHP_5_3/ext/sqlite3/tests/bug53463.phpt === --- php/php-src/branches/PHP_5_3/ext/sqlite3/tests/bug53463.phpt 2011-09-06 07:26:05 UTC (rev 316224) +++ php/php-src/branches/PHP_5_3/ext/sqlite3/tests/bug53463.phpt 2011-09-06 07:28:38 UTC (rev 316225) @@ -1,5 +1,7 @@ --TEST-- Bug #53463 (sqlite3 columnName() segfaults on bad column_number) +--SKIPIF-- + --FILE-- --FILE-- --FILE-- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/mysqli/tests/bug55582.phpt trunk/ext/mysqli/tests/bug55582.phpt
Hi Stas,
this bug was really mysqli@mysqlnd. No other tests test this, this is
why we were not able to catch this before. Therefore, it should be
enabled also for libmysql, because it checks right behavior. It's about
regression testing, and if libmysql fails someday on this, we should be
able to catch it.
Andrey
On 09/06/2011 07:13 AM, Stanislav Malyshev wrote:
stas Tue, 06 Sep 2011 05:13:47 +
Revision: http://svn.php.net/viewvc?view=revision&revision=316203
Log:
this tests looks mysqlnd only
Changed paths:
U php/php-src/branches/PHP_5_4/ext/mysqli/tests/bug55582.phpt
U php/php-src/trunk/ext/mysqli/tests/bug55582.phpt
Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/bug55582.phpt
===
--- php/php-src/branches/PHP_5_4/ext/mysqli/tests/bug55582.phpt 2011-09-06
05:04:37 UTC (rev 316202)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/bug55582.phpt 2011-09-06
05:13:47 UTC (rev 316203)
@@ -5,6 +5,7 @@
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
require_once("connect.inc");
+if(!$IS_MYSQLND) die("skip This bug is for mysqlnd only");
?>
--FILE--
--FILE--
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/sqlite3/tests/sqlite3_prepare_001.phpt branches/PHP_5_4/ext/sqlite3/tests/sqlite3_prepare_001.phpt trunk/ext/sqlite3/tests/sqlite3_prepare_001.phpt
pajoye Tue, 06 Sep 2011 07:29:59 + Revision: http://svn.php.net/viewvc?view=revision&revision=316226 Log: - add skipif Changed paths: U php/php-src/branches/PHP_5_3/ext/sqlite3/tests/sqlite3_prepare_001.phpt U php/php-src/branches/PHP_5_4/ext/sqlite3/tests/sqlite3_prepare_001.phpt U php/php-src/trunk/ext/sqlite3/tests/sqlite3_prepare_001.phpt Modified: php/php-src/branches/PHP_5_3/ext/sqlite3/tests/sqlite3_prepare_001.phpt === --- php/php-src/branches/PHP_5_3/ext/sqlite3/tests/sqlite3_prepare_001.phpt 2011-09-06 07:28:38 UTC (rev 316225) +++ php/php-src/branches/PHP_5_3/ext/sqlite3/tests/sqlite3_prepare_001.phpt 2011-09-06 07:29:59 UTC (rev 316226) @@ -1,5 +1,7 @@ --TEST-- SQLite3 - memory leak on SQLite3Result and SQLite3Stmt +--SKIPIF-- + --FILE-- --FILE-- --FILE-- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/tests/directory/open_basedir_001.phpt branches/PHP_5_4/ext/standard/tests/directory/open_basedir_001.phpt trunk/ext/standard/tests/directory/
pajoye Tue, 06 Sep 2011 07:32:37 + Revision: http://svn.php.net/viewvc?view=revision&revision=316227 Log: - skip on win Changed paths: U php/php-src/branches/PHP_5_3/ext/standard/tests/directory/open_basedir_001.phpt U php/php-src/branches/PHP_5_4/ext/standard/tests/directory/open_basedir_001.phpt U php/php-src/trunk/ext/standard/tests/directory/open_basedir_001.phpt Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/directory/open_basedir_001.phpt === --- php/php-src/branches/PHP_5_3/ext/standard/tests/directory/open_basedir_001.phpt 2011-09-06 07:29:59 UTC (rev 316226) +++ php/php-src/branches/PHP_5_3/ext/standard/tests/directory/open_basedir_001.phpt 2011-09-06 07:32:37 UTC (rev 316227) @@ -1,5 +1,10 @@ --TEST-- openbase_dir runtime tightning +--SKIPIF-- +-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/mysqli/tests/bug55582.phpt trunk/ext/mysqli/tests/bug55582.phpt
Hi! On 9/6/11 12:28 AM, Andrey Hristov wrote: this bug was really mysqli@mysqlnd. No other tests test this, this is why we were not able to catch this before. Therefore, it should be enabled also for libmysql, because it checks right behavior. It's about regression testing, and if libmysql fails someday on this, we should be able to catch it. This behavior (specifically, returning number of rows after last fetch) was never part of libmysql, was never documented in mysql docs and is new and unique for mysqlnd. What exactly is the use to enable this test for libmysql - just generate yet another failure that never will be fixed to pollute our test results and make legitimate failures harder to spot? -- Stanislav Malyshev, Software Architect SugarCRM: http://www.sugarcrm.com/ (408)454-6900 ext. 227 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/standard/tests/file/rename_variation13-win32.phpt trunk/ext/standard/tests/file/rename_variation13-win32.phpt
pajoye Tue, 06 Sep 2011 07:44:43 + Revision: http://svn.php.net/viewvc?view=revision&revision=316228 Log: - fix test Changed paths: U php/php-src/branches/PHP_5_4/ext/standard/tests/file/rename_variation13-win32.phpt U php/php-src/trunk/ext/standard/tests/file/rename_variation13-win32.phpt Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/rename_variation13-win32.phpt === --- php/php-src/branches/PHP_5_4/ext/standard/tests/file/rename_variation13-win32.phpt 2011-09-06 07:32:37 UTC (rev 316227) +++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/rename_variation13-win32.phpt 2011-09-06 07:44:43 UTC (rev 316228) @@ -71,73 +71,74 @@ -- 0 testing '-1' integer -- bool(true) -Warning: rename(-1,%s/renameVar13/afile.tmp): The system cannot find the file specified. (code: 2) in %s on line %d +Warning: rename(-1,%safile.tmp): The system cannot find the file specified. (code: 2) in %srename_variation13-win32.php on line 50 bool(false) -- 1 testing '1' boolean -- bool(true) -Warning: rename(1,%s/renameVar13/afile.tmp): The system cannot find the file specified. (code: 2) in %s on line %d +Warning: rename(1,%safile.tmp): The system cannot find the file specified. (code: 2) in %srename_variation13-win32.php on line 50 bool(false) -- 2 testing '' boolean -- -Warning: rename(%s/renameVar13/afile.tmp,): %s in %s on line %d +Warning: rename(%safile.tmp,): Invalid argument in %srename_variation13-win32.php on line 42 bool(false) -Warning: rename(,%s/renameVar13/afile.tmp): %s in %s on line %d +Warning: rename(,%safile.tmp): Invalid argument in %srename_variation13-win32.php on line 50 bool(false) -- 3 testing '' NULL -- -Warning: rename(%s/renameVar13/afile.tmp,): %s in %s on line %d +Warning: rename(%safile.tmp,): Invalid argument in %srename_variation13-win32.php on line 42 bool(false) -Warning: rename(,%s/renameVar13/afile.tmp): %s in %s on line %d +Warning: rename(,%safile.tmp): Invalid argument in %srename_variation13-win32.php on line 50 bool(false) -- 4 testing '' string -- -Warning: rename(%s/renameVar13/afile.tmp,): %s in %s on line %d +Warning: rename(%safile.tmp,): Invalid argument in %srename_variation13-win32.php on line 42 bool(false) -Warning: rename(,%s/renameVar13/afile.tmp):%s in %s on line %d +Warning: rename(,%safile.tmp): Invalid argument in %srename_variation13-win32.php on line 50 bool(false) -- 5 testing ' ' string -- -Warning: rename(%s/renameVar13/afile.tmp, ): The filename, directory name, or volume label syntax is incorrect. (code: 123) in %s on line %d +Warning: rename() expects parameter 2 to be a valid path, string given in %srename_variation13-win32.php on line 42 bool(false) -Warning: rename( ,%s/renameVar13/afile.tmp): The filename, directory name, or volume label syntax is incorrect. (code: 123) in %s on line %d +Warning: file_exists() expects parameter 1 to be a valid path, string given in %srename_variation13-win32.php on line 43 + +Warning: rename() expects parameter 1 to be a valid path, string given in %srename_variation13-win32.php on line 50 bool(false) -- 6 testing ' ' string -- -Warning: rename() expects parameter 2 to be a valid path, string given in %s on line %d +Warning: rename() expects parameter 2 to be a valid path, string given in %srename_variation13-win32.php on line 42 bool(false) -Warning: file_exists() expects parameter 1 to be a valid path, string given in %s on line %d +Warning: file_exists() expects parameter 1 to be a valid path, string given in %srename_variation13-win32.php on line 43 -Warning: rename() expects parameter 1 to be a valid path, string given in %s on line %d +Warning: rename() expects parameter 1 to be a valid path, string given in %srename_variation13-win32.php on line 50 bool(false) -- 7 testing 'Array' array -- -Warning: rename() expects parameter 2 to be a valid path, array given in %s on line %d +Warning: rename() expects parameter 2 to be a valid path, array given in %srename_variation13-win32.php on line 42 bool(false) -Warning: file_exists() expects parameter 1 to be a valid path, array given in %s on line %d +Warning: file_exists() expects parameter 1 to be a valid path, array given in %srename_variation13-win32.php on line 43 -Warning: rename() expects parameter 1 to be a valid path, array given in %s on line %d +Warning: rename() expects parameter 1 to be a valid path, array given in %srename_variation13-win32.php on line 50 bool(false) -- 8 testing '/no/such/file/dir' string -- -Warning: rename(%s/renameVar13/afile.tmp,/no/such/file/dir): The system cannot find the path specified. (code: 3) in %s on line %d +Warning: rename(%safile.tmp,/no/such/file/dir): The system cannot find the path specified. (code: 3) in %srename_variation13-win32.php on line 42 bool(false) -Warning: rename(/no/such/file/dir,%s/renameVar13/afile.tmp): The system cannot find the path spe
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/tests/php_ini_loaded_file.phpt branches/PHP_5_4/ext/standard/tests/php_ini_loaded_file.phpt trunk/ext/standard/tests/php_ini_loaded_file.phpt
pajoye Tue, 06 Sep 2011 07:47:20 + Revision: http://svn.php.net/viewvc?view=revision&revision=316229 Log: - fix test Changed paths: U php/php-src/branches/PHP_5_3/ext/standard/tests/php_ini_loaded_file.phpt U php/php-src/branches/PHP_5_4/ext/standard/tests/php_ini_loaded_file.phpt U php/php-src/trunk/ext/standard/tests/php_ini_loaded_file.phpt Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/php_ini_loaded_file.phpt === --- php/php-src/branches/PHP_5_3/ext/standard/tests/php_ini_loaded_file.phpt 2011-09-06 07:44:43 UTC (rev 316228) +++ php/php-src/branches/PHP_5_3/ext/standard/tests/php_ini_loaded_file.phpt 2011-09-06 07:47:20 UTC (rev 316229) @@ -11,4 +11,4 @@ var_dump(php_ini_loaded_file()); ?> --EXPECTF-- -string(%d) "%s/tmp-php.ini" +string(%d) "%sphp.ini" Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/php_ini_loaded_file.phpt === --- php/php-src/branches/PHP_5_4/ext/standard/tests/php_ini_loaded_file.phpt 2011-09-06 07:44:43 UTC (rev 316228) +++ php/php-src/branches/PHP_5_4/ext/standard/tests/php_ini_loaded_file.phpt 2011-09-06 07:47:20 UTC (rev 316229) @@ -11,4 +11,4 @@ var_dump(php_ini_loaded_file()); ?> --EXPECTF-- -string(%d) "%stmp-php.ini" +string(%d) "%sphp.ini" Modified: php/php-src/trunk/ext/standard/tests/php_ini_loaded_file.phpt === --- php/php-src/trunk/ext/standard/tests/php_ini_loaded_file.phpt 2011-09-06 07:44:43 UTC (rev 316228) +++ php/php-src/trunk/ext/standard/tests/php_ini_loaded_file.phpt 2011-09-06 07:47:20 UTC (rev 316229) @@ -11,4 +11,4 @@ var_dump(php_ini_loaded_file()); ?> --EXPECTF-- -string(%d) "%stmp-php.ini" +string(%d) "%sphp.ini" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/sysvshm/tests/001.phpt branches/PHP_5_4/ext/sysvshm/tests/001.phpt trunk/ext/sysvshm/tests/001.phpt
pajoye Tue, 06 Sep 2011 07:49:31 + Revision: http://svn.php.net/viewvc?view=revision&revision=316230 Log: - add skipif Changed paths: U php/php-src/branches/PHP_5_3/ext/sysvshm/tests/001.phpt U php/php-src/branches/PHP_5_4/ext/sysvshm/tests/001.phpt U php/php-src/trunk/ext/sysvshm/tests/001.phpt Modified: php/php-src/branches/PHP_5_3/ext/sysvshm/tests/001.phpt === --- php/php-src/branches/PHP_5_3/ext/sysvshm/tests/001.phpt 2011-09-06 07:47:20 UTC (rev 316229) +++ php/php-src/branches/PHP_5_3/ext/sysvshm/tests/001.phpt 2011-09-06 07:49:31 UTC (rev 316230) @@ -1,5 +1,7 @@ --TEST-- ftok() tests +--SKIPIF-- + --FILE-- --FILE-- --FILE-- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/filter/tests/005.phpt branches/PHP_5_4/ext/filter/tests/005.phpt trunk/ext/filter/tests/005.phpt
laruence Tue, 06 Sep 2011 08:11:37 + Revision: http://svn.php.net/viewvc?view=revision&revision=316231 Log: add skipif Changed paths: U php/php-src/branches/PHP_5_3/ext/filter/tests/005.phpt U php/php-src/branches/PHP_5_4/ext/filter/tests/005.phpt U php/php-src/trunk/ext/filter/tests/005.phpt Modified: php/php-src/branches/PHP_5_3/ext/filter/tests/005.phpt === --- php/php-src/branches/PHP_5_3/ext/filter/tests/005.phpt 2011-09-06 07:49:31 UTC (rev 316230) +++ php/php-src/branches/PHP_5_3/ext/filter/tests/005.phpt 2011-09-06 08:11:37 UTC (rev 316231) @@ -1,5 +1,7 @@ --TEST-- GET/REQUEST Test with fifa example data +--SKIPIF-- + --INI-- filter.default=stripped --GET-- Modified: php/php-src/branches/PHP_5_4/ext/filter/tests/005.phpt === --- php/php-src/branches/PHP_5_4/ext/filter/tests/005.phpt 2011-09-06 07:49:31 UTC (rev 316230) +++ php/php-src/branches/PHP_5_4/ext/filter/tests/005.phpt 2011-09-06 08:11:37 UTC (rev 316231) @@ -1,5 +1,7 @@ --TEST-- GET/REQUEST Test with fifa example data +--SKIPIF-- + --INI-- filter.default=stripped --GET-- Modified: php/php-src/trunk/ext/filter/tests/005.phpt === --- php/php-src/trunk/ext/filter/tests/005.phpt 2011-09-06 07:49:31 UTC (rev 316230) +++ php/php-src/trunk/ext/filter/tests/005.phpt 2011-09-06 08:11:37 UTC (rev 316231) @@ -1,5 +1,7 @@ --TEST-- GET/REQUEST Test with fifa example data +--SKIPIF-- + --INI-- filter.default=stripped --GET-- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/mysqli/tests/bug55582.phpt trunk/ext/mysqli/tests/bug55582.phpt
On 09/06/2011 09:38 AM, Stas Malyshev wrote: Hi! On 9/6/11 12:28 AM, Andrey Hristov wrote: this bug was really mysqli@mysqlnd. No other tests test this, this is why we were not able to catch this before. Therefore, it should be enabled also for libmysql, because it checks right behavior. It's about regression testing, and if libmysql fails someday on this, we should be able to catch it. This behavior (specifically, returning number of rows after last fetch) was never part of libmysql, was never documented in mysql docs and is new and unique for mysqlnd. What exactly is the use to enable this test for libmysql - just generate yet another failure that never will be fixed to pollute our test results and make legitimate failures harder to spot? no, it's about consistency, which you want. mysqlnd should behave like libmysql, and it is a test that can test it. What libmysql returns in filtered in mysqli, mysqli_num_rows() is a direct wrapper around mysql_num_rows(), and this is what we test. Andrey -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/standard/filestat.c trunk/ext/standard/filestat.c
tests pass now, thanks!
On Tue, Sep 6, 2011 at 7:28 AM, Stanislav Malyshev wrote:
> stas Tue, 06 Sep 2011 05:28:25 +
>
> Revision: http://svn.php.net/viewvc?view=revision&revision=316207
>
> Log:
> allow user streams to override ch* on windows too
>
> Changed paths:
> U php/php-src/branches/PHP_5_4/ext/standard/filestat.c
> U php/php-src/trunk/ext/standard/filestat.c
>
> Modified: php/php-src/branches/PHP_5_4/ext/standard/filestat.c
> ===
> --- php/php-src/branches/PHP_5_4/ext/standard/filestat.c 2011-09-06
> 05:21:56 UTC (rev 316206)
> +++ php/php-src/branches/PHP_5_4/ext/standard/filestat.c 2011-09-06
> 05:28:25 UTC (rev 316207)
> @@ -415,6 +415,7 @@
> #endif
> return SUCCESS;
> }
> +#endif
>
> static void php_do_chgrp(INTERNAL_FUNCTION_PARAMETERS, int do_lchgrp) /* {{{
> */
> {
> @@ -450,11 +451,18 @@
> RETURN_FALSE;
> }
> } else {
> +#if !defined(WINDOWS)
> +/* On Windows, we expect regular chgrp to fail silently by default */
> php_error_docref(NULL TSRMLS_CC, E_WARNING, "Can not
> call chgrp() for a non-standard stream");
> +#endif
> RETURN_FALSE;
> }
> }
>
> +#if defined(WINDOWS)
> + /* We have no native chgrp on Windows, nothing left to do if stream
> doesn't have own implementation */
> + RETURN_FALSE;
> +#else
> if (Z_TYPE_P(group) == IS_LONG) {
> gid = (gid_t)Z_LVAL_P(group);
> } else if (Z_TYPE_P(group) == IS_STRING) {
> @@ -484,20 +492,16 @@
> RETURN_FALSE;
> }
> RETURN_TRUE;
> +#endif
> }
> /* }}} */
> -#endif
>
> #ifndef NETWARE
> /* {{{ proto bool chgrp(string filename, mixed group)
> Change file group */
> PHP_FUNCTION(chgrp)
> {
> -#if !defined(WINDOWS)
> php_do_chgrp(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
> -#else
> - RETURN_FALSE;
> -#endif
> }
> /* }}} */
>
> @@ -546,6 +550,7 @@
> #endif
> return SUCCESS;
> }
> +#endif
>
> static void php_do_chown(INTERNAL_FUNCTION_PARAMETERS, int do_lchown) /* {{{
> */
> {
> @@ -581,11 +586,19 @@
> RETURN_FALSE;
> }
> } else {
> +#if !defined(WINDOWS)
> +/* On Windows, we expect regular chown to fail silently by default */
> php_error_docref(NULL TSRMLS_CC, E_WARNING, "Can not
> call chown() for a non-standard stream");
> +#endif
> RETURN_FALSE;
> }
> }
>
> +#if defined(WINDOWS)
> + /* We have no native chown on Windows, nothing left to do if stream
> doesn't have own implementation */
> + RETURN_FALSE;
> +#else
> +
> if (Z_TYPE_P(user) == IS_LONG) {
> uid = (uid_t)Z_LVAL_P(user);
> } else if (Z_TYPE_P(user) == IS_STRING) {
> @@ -614,21 +627,18 @@
> php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s",
> strerror(errno));
> RETURN_FALSE;
> }
> + RETURN_TRUE;
> +#endif
> }
> /* }}} */
> -#endif
>
> +
> #ifndef NETWARE
> /* {{{ proto bool chown (string filename, mixed user)
> Change file owner */
> PHP_FUNCTION(chown)
> {
> -#if !defined(WINDOWS)
> - RETVAL_TRUE;
> php_do_chown(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
> -#else
> - RETURN_FALSE;
> -#endif
> }
> /* }}} */
>
>
> Modified: php/php-src/trunk/ext/standard/filestat.c
> ===
> --- php/php-src/trunk/ext/standard/filestat.c 2011-09-06 05:21:56 UTC (rev
> 316206)
> +++ php/php-src/trunk/ext/standard/filestat.c 2011-09-06 05:28:25 UTC (rev
> 316207)
> @@ -415,6 +415,7 @@
> #endif
> return SUCCESS;
> }
> +#endif
>
> static void php_do_chgrp(INTERNAL_FUNCTION_PARAMETERS, int do_lchgrp) /* {{{
> */
> {
> @@ -450,11 +451,18 @@
> RETURN_FALSE;
> }
> } else {
> +#if !defined(WINDOWS)
> +/* On Windows, we expect regular chgrp to fail silently by default */
> php_error_docref(NULL TSRMLS_CC, E_WARNING, "Can not
> call chgrp() for a non-standard stream");
> +#endif
> RETURN_FALSE;
> }
> }
>
> +#if defined(WINDOWS)
> + /* We have no native chgrp on Windows, nothing left to do if stream
> doesn't have own implementation */
> + RETURN_FALSE;
> +#else
> if (Z_TYPE_P(group) == IS_LONG) {
> gid = (gid_t)Z_LVAL_P(group);
> } else if (Z_TYPE_P(group) == IS_STRING) {
> @@ -484,20 +492,16 @@
> RETURN_FALSE;
> }
> RETURN_TRUE;
> +#endif
> }
> /* }}} */
> -#endif
>
> #ifndef NETWARE
> /* {{{ proto bool chgrp(string filename, mixed group)
> Change file group */
> PHP_FUNCTION(chgrp
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/mysqli/tests/bug55582.phpt trunk/ext/mysqli/tests/bug55582.phpt
Hi! On 9/6/11 1:24 AM, Andrey Hristov wrote: no, it's about consistency, which you want. mysqlnd should behave like libmysql, and it is a test that can test it. What libmysql returns in filtered in mysqli, mysqli_num_rows() is a direct wrapper around mysql_num_rows(), and this is what we test. Sorry, I don't understand. mysqlnd returns non-zero number of rows after last fetch, libmysql does not, and that's what you test for. Are you saying it's a bug in libmysql or mysqli driver that it doesn't return that number? -- Stanislav Malyshev, Software Architect SugarCRM: http://www.sugarcrm.com/ (408)454-6900 ext. 227 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/tests/directory/open_basedir_001.phpt branches/PHP_5_4/ext/standard/tests/directory/open_basedir_001.phpt trunk/ext/standard/tests/direct
Pierre, the code and skip messages like this contradict each other:
> +--SKIPIF--
> + +if (substr(PHP_OS, 0, 3) == 'WIN') {
> + die('skip.. only for Windows');
> +}
You're checking that OS is Windows but message says that test is only
for windows. If your intention was to skip this test on Windows, than
message like "skip... not for Windows" would better suit this case.
Otherwise, you need to change "if" condition.
2011/9/6 Pierre Joye :
> pajoye Tue, 06 Sep 2011 07:32:37 +
>
> Revision: http://svn.php.net/viewvc?view=revision&revision=316227
>
> Log:
> - skip on win
>
> Changed paths:
> U
> php/php-src/branches/PHP_5_3/ext/standard/tests/directory/open_basedir_001.phpt
> U
> php/php-src/branches/PHP_5_4/ext/standard/tests/directory/open_basedir_001.phpt
> U php/php-src/trunk/ext/standard/tests/directory/open_basedir_001.phpt
>
> Modified:
> php/php-src/branches/PHP_5_3/ext/standard/tests/directory/open_basedir_001.phpt
> ===
> ---
> php/php-src/branches/PHP_5_3/ext/standard/tests/directory/open_basedir_001.phpt
> 2011-09-06 07:29:59 UTC (rev 316226)
> +++
> php/php-src/branches/PHP_5_3/ext/standard/tests/directory/open_basedir_001.phpt
> 2011-09-06 07:32:37 UTC (rev 316227)
> @@ -1,5 +1,10 @@
> --TEST--
> openbase_dir runtime tightning
> +--SKIPIF--
> + +if (substr(PHP_OS, 0, 3) == 'WIN') {
> + die('skip.. only for Windows');
> +}
> --INI--
> open_basedir=/usr/local
> --FILE--
>
> Modified:
> php/php-src/branches/PHP_5_4/ext/standard/tests/directory/open_basedir_001.phpt
> ===
> ---
> php/php-src/branches/PHP_5_4/ext/standard/tests/directory/open_basedir_001.phpt
> 2011-09-06 07:29:59 UTC (rev 316226)
> +++
> php/php-src/branches/PHP_5_4/ext/standard/tests/directory/open_basedir_001.phpt
> 2011-09-06 07:32:37 UTC (rev 316227)
> @@ -1,5 +1,10 @@
> --TEST--
> openbase_dir runtime tightning
> +--SKIPIF--
> + +if (substr(PHP_OS, 0, 3) == 'WIN') {
> + die('skip.. only for Windows');
> +}
> --INI--
> open_basedir=/usr/local
> --FILE--
>
> Modified: php/php-src/trunk/ext/standard/tests/directory/open_basedir_001.phpt
> ===
> --- php/php-src/trunk/ext/standard/tests/directory/open_basedir_001.phpt
> 2011-09-06 07:29:59 UTC (rev 316226)
> +++ php/php-src/trunk/ext/standard/tests/directory/open_basedir_001.phpt
> 2011-09-06 07:32:37 UTC (rev 316227)
> @@ -1,5 +1,10 @@
> --TEST--
> openbase_dir runtime tightning
> +--SKIPIF--
> + +if (substr(PHP_OS, 0, 3) == 'WIN') {
> + die('skip.. only for Windows');
> +}
> --INI--
> open_basedir=/usr/local
> --FILE--
>
>
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
>
--
Regards,
Shein Alexey
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/reflection/tests/ReflectionClass_newInstanceWithoutConstructor.phpt trunk/ext/reflection/tests/ReflectionClass_newInstanceWithoutConstructor.phpt
pajoye Tue, 06 Sep 2011 07:07:23 +
Revision: http://svn.php.net/viewvc?view=revision&revision=316220
Log:
- don't test dir sep
Changed paths:
U
php/php-src/branches/PHP_5_4/ext/reflection/tests/ReflectionClass_newInstanceWithoutConstructor.phpt
U
php/php-src/trunk/ext/reflection/tests/ReflectionClass_newInstanceWithoutConstructor.phpt
Modified:
php/php-src/branches/PHP_5_4/ext/reflection/tests/ReflectionClass_newInstanceWithoutConstructor.phpt
===
---
php/php-src/branches/PHP_5_4/ext/reflection/tests/ReflectionClass_newInstanceWithoutConstructor.phpt
2011-09-06 07:03:48 UTC (rev 316219)
+++
php/php-src/branches/PHP_5_4/ext/reflection/tests/ReflectionClass_newInstanceWithoutConstructor.phpt
2011-09-06 07:07:23 UTC (rev 316220)
@@ -26,8 +26,8 @@
object(stdClass)#%d (0) {
}
-Fatal error: Uncaught exception 'ReflectionException' with message 'Class
DateTime is an internal class that cannot be instantiated without invoking its
constructor' in %s/tests/ReflectionClass_newInstanceWithoutConstructor.php:%d
+Fatal error: Uncaught exception 'ReflectionException' with message 'Class
DateTime is an internal class that cannot be instantiated without invoking its
constructor' in %sReflectionClass_newInstanceWithoutConstructor.php:%d
Stack trace:
-#0 %s/ReflectionClass_newInstanceWithoutConstructor.php(%d):
ReflectionClass->newInstanceWithoutConstructor()
+#0 %sReflectionClass_newInstanceWithoutConstructor.php(%d):
ReflectionClass->newInstanceWithoutConstructor()
#1 {main}
- thrown in %s/ReflectionClass_newInstanceWithoutConstructor.php on line %d
+ thrown in %sReflectionClass_newInstanceWithoutConstructor.php on line %d
Modified:
php/php-src/trunk/ext/reflection/tests/ReflectionClass_newInstanceWithoutConstructor.phpt
===
---
php/php-src/trunk/ext/reflection/tests/ReflectionClass_newInstanceWithoutConstructor.phpt
2011-09-06 07:03:48 UTC (rev 316219)
+++
php/php-src/trunk/ext/reflection/tests/ReflectionClass_newInstanceWithoutConstructor.phpt
2011-09-06 07:07:23 UTC (rev 316220)
@@ -26,8 +26,8 @@
object(stdClass)#%d (0) {
}
-Fatal error: Uncaught exception 'ReflectionException' with message 'Class
DateTime is an internal class that cannot be instantiated without invoking its
constructor' in %s/tests/ReflectionClass_newInstanceWithoutConstructor.php:%d
+Fatal error: Uncaught exception 'ReflectionException' with message 'Class
DateTime is an internal class that cannot be instantiated without invoking its
constructor' in %sReflectionClass_newInstanceWithoutConstructor.php:%d
Stack trace:
-#0 %s/ReflectionClass_newInstanceWithoutConstructor.php(%d):
ReflectionClass->newInstanceWithoutConstructor()
+#0 %sReflectionClass_newInstanceWithoutConstructor.php(%d):
ReflectionClass->newInstanceWithoutConstructor()
#1 {main}
- thrown in %s/ReflectionClass_newInstanceWithoutConstructor.php on line %d
+ thrown in %sReflectionClass_newInstanceWithoutConstructor.php on line %d
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/intl/tests/resourcebundle_arrayaccess.phpt branches/PHP_5_3/ext/intl/tests/resourcebundle_individual.phpt branches/PHP_5_3/ext/intl/tests/resourcebund
laruence Tue, 06 Sep 2011 09:17:12 + Revision: http://svn.php.net/viewvc?view=revision&revision=316233 Log: Added skipif Changed paths: U php/php-src/branches/PHP_5_3/ext/intl/tests/resourcebundle_arrayaccess.phpt U php/php-src/branches/PHP_5_3/ext/intl/tests/resourcebundle_individual.phpt U php/php-src/branches/PHP_5_3/ext/intl/tests/resourcebundle_iterator.phpt U php/php-src/branches/PHP_5_4/ext/intl/tests/resourcebundle_arrayaccess.phpt U php/php-src/branches/PHP_5_4/ext/intl/tests/resourcebundle_individual.phpt U php/php-src/branches/PHP_5_4/ext/intl/tests/resourcebundle_iterator.phpt U php/php-src/trunk/ext/intl/tests/resourcebundle_arrayaccess.phpt U php/php-src/trunk/ext/intl/tests/resourcebundle_individual.phpt U php/php-src/trunk/ext/intl/tests/resourcebundle_iterator.phpt Modified: php/php-src/branches/PHP_5_3/ext/intl/tests/resourcebundle_arrayaccess.phpt === --- php/php-src/branches/PHP_5_3/ext/intl/tests/resourcebundle_arrayaccess.phpt 2011-09-06 09:12:36 UTC (rev 316232) +++ php/php-src/branches/PHP_5_3/ext/intl/tests/resourcebundle_arrayaccess.phpt 2011-09-06 09:17:12 UTC (rev 316233) @@ -1,5 +1,7 @@ --TEST-- Test ResourceBundle array access and count - existing/missing keys +--SKIPIF-- + --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/mcrypt/tests/ bug46010.phpt
laruence Tue, 06 Sep 2011 09:19:46 + Revision: http://svn.php.net/viewvc?view=revision&revision=316235 Log: Added skipif Changed paths: U php/php-src/branches/PHP_5_3/ext/mcrypt/tests/bug46010.phpt Modified: php/php-src/branches/PHP_5_3/ext/mcrypt/tests/bug46010.phpt === --- php/php-src/branches/PHP_5_3/ext/mcrypt/tests/bug46010.phpt 2011-09-06 09:17:22 UTC (rev 316234) +++ php/php-src/branches/PHP_5_3/ext/mcrypt/tests/bug46010.phpt 2011-09-06 09:19:46 UTC (rev 316235) @@ -1,5 +1,7 @@ --TEST-- Bug #46010 (warnings incorrectly generated for iv in ecb mode) +--SKIPIF-- + --FILE-- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/tests/directory/open_basedir_001.phpt branches/PHP_5_4/ext/standard/tests/directory/open_basedir_001.phpt trunk/ext/standard/tests/directory/
pajoye Tue, 06 Sep 2011 09:20:14 + Revision: http://svn.php.net/viewvc?view=revision&revision=316236 Log: - fix skipif msg Changed paths: U php/php-src/branches/PHP_5_3/ext/standard/tests/directory/open_basedir_001.phpt U php/php-src/branches/PHP_5_4/ext/standard/tests/directory/open_basedir_001.phpt U php/php-src/trunk/ext/standard/tests/directory/open_basedir_001.phpt Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/directory/open_basedir_001.phpt === --- php/php-src/branches/PHP_5_3/ext/standard/tests/directory/open_basedir_001.phpt 2011-09-06 09:19:46 UTC (rev 316235) +++ php/php-src/branches/PHP_5_3/ext/standard/tests/directory/open_basedir_001.phpt 2011-09-06 09:20:14 UTC (rev 316236) @@ -3,7 +3,7 @@ --SKIPIF-- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/pdo_mysql/tests/common.phpt trunk/ext/pdo_mysql/tests/common.phpt
Am 06.09.2011 07:21, schrieb Stanislav Malyshev: U php/php-src/branches/PHP_5_4/ext/pdo_mysql/tests/common.phpt U php/php-src/trunk/ext/pdo_mysql/tests/common.phpt Any reason not to include 5_3? Ulf -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/mysqli/mysqli.c trunk/ext/mysqli/mysqli.c
Am 06.09.2011 07:20, schrieb Stanislav Malyshev: U php/php-src/branches/PHP_5_4/ext/mysqli/mysqli.c U php/php-src/trunk/ext/mysqli/mysqli.c Same here: why not 5_3? Ulf -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/filter/tests/ bug39763.phpt
laruence Tue, 06 Sep 2011 09:22:06 + Revision: http://svn.php.net/viewvc?view=revision&revision=316237 Log: Added skipif Changed paths: U php/php-src/branches/PHP_5_3/ext/filter/tests/bug39763.phpt Modified: php/php-src/branches/PHP_5_3/ext/filter/tests/bug39763.phpt === --- php/php-src/branches/PHP_5_3/ext/filter/tests/bug39763.phpt 2011-09-06 09:20:14 UTC (rev 316236) +++ php/php-src/branches/PHP_5_3/ext/filter/tests/bug39763.phpt 2011-09-06 09:22:06 UTC (rev 316237) @@ -1,5 +1,7 @@ --TEST-- Bug #39763 (filter applies magic_quotes twice in parse_str()) +--SKIPIF-- + --INI-- magic_quotes_gpc=1 filter.default= @@ -14,4 +16,4 @@ --EXPECT-- Deprecated: Directive 'magic_quotes_gpc' is deprecated in PHP 5.3 and greater in Unknown on line 0 \"probably a bug\" -\"probably a bug\" \ No newline at end of file +\"probably a bug\" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/tests/directory/open_basedir_001.phpt branches/PHP_5_3/tests/security/open_basedir_001.phpt branches/PHP_5_4/ext/standard/tests/directory/ope
pajoye Tue, 06 Sep 2011 09:23:10 + Revision: http://svn.php.net/viewvc?view=revision&revision=316238 Log: - move it to the right place Changed paths: D php/php-src/branches/PHP_5_3/ext/standard/tests/directory/open_basedir_001.phpt A + php/php-src/branches/PHP_5_3/tests/security/open_basedir_001.phpt (from php/php-src/branches/PHP_5_3/ext/standard/tests/directory/open_basedir_001.phpt:r316236) D php/php-src/branches/PHP_5_4/ext/standard/tests/directory/open_basedir_001.phpt A + php/php-src/branches/PHP_5_4/tests/security/open_basedir_001.phpt (from php/php-src/branches/PHP_5_4/ext/standard/tests/directory/open_basedir_001.phpt:r316236) D php/php-src/trunk/ext/standard/tests/directory/open_basedir_001.phpt A + php/php-src/trunk/tests/security/open_basedir_001.phpt (from php/php-src/trunk/ext/standard/tests/directory/open_basedir_001.phpt:r316236) Deleted: php/php-src/branches/PHP_5_3/ext/standard/tests/directory/open_basedir_001.phpt === --- php/php-src/branches/PHP_5_3/ext/standard/tests/directory/open_basedir_001.phpt 2011-09-06 09:22:06 UTC (rev 316237) +++ php/php-src/branches/PHP_5_3/ext/standard/tests/directory/open_basedir_001.phpt 2011-09-06 09:23:10 UTC (rev 316238) @@ -1,22 +0,0 @@ ---TEST-- -openbase_dir runtime tightning ---SKIPIF-- - ---EXPECT-- -string(10) "/usr/local" -string(14) "/usr/local/bin" -bool(false) -string(14) "/usr/local/bin" - Copied: php/php-src/branches/PHP_5_3/tests/security/open_basedir_001.phpt (from rev 316236, php/php-src/branches/PHP_5_3/ext/standard/tests/directory/open_basedir_001.phpt) === --- php/php-src/branches/PHP_5_3/tests/security/open_basedir_001.phpt (rev 0) +++ php/php-src/branches/PHP_5_3/tests/security/open_basedir_001.phpt 2011-09-06 09:23:10 UTC (rev 316238) @@ -0,0 +1,22 @@ +--TEST-- +openbase_dir runtime tightning +--SKIPIF-- + +--EXPECT-- +string(10) "/usr/local" +string(14) "/usr/local/bin" +bool(false) +string(14) "/usr/local/bin" + Deleted: php/php-src/branches/PHP_5_4/ext/standard/tests/directory/open_basedir_001.phpt === --- php/php-src/branches/PHP_5_4/ext/standard/tests/directory/open_basedir_001.phpt 2011-09-06 09:22:06 UTC (rev 316237) +++ php/php-src/branches/PHP_5_4/ext/standard/tests/directory/open_basedir_001.phpt 2011-09-06 09:23:10 UTC (rev 316238) @@ -1,22 +0,0 @@ ---TEST-- -openbase_dir runtime tightning ---SKIPIF-- - ---EXPECT-- -string(10) "/usr/local" -string(14) "/usr/local/bin" -bool(false) -string(14) "/usr/local/bin" - Copied: php/php-src/branches/PHP_5_4/tests/security/open_basedir_001.phpt (from rev 316236, php/php-src/branches/PHP_5_4/ext/standard/tests/directory/open_basedir_001.phpt) === --- php/php-src/branches/PHP_5_4/tests/security/open_basedir_001.phpt (rev 0) +++ php/php-src/branches/PHP_5_4/tests/security/open_basedir_001.phpt 2011-09-06 09:23:10 UTC (rev 316238) @@ -0,0 +1,22 @@ +--TEST-- +openbase_dir runtime tightning +--SKIPIF-- + +--EXPECT-- +string(10) "/usr/local" +string(14) "/usr/local/bin" +bool(false) +string(14) "/usr/local/bin" + Deleted: php/php-src/trunk/ext/standard/tests/directory/open_basedir_001.phpt === --- php/php-src/trunk/ext/standard/tests/directory/open_basedir_001.phpt 2011-09-06 09:22:06 UTC (rev 316237) +++ php/php-src/trunk/ext/standard/tests/directory/open_basedir_001.phpt 2011-09-06 09:23:10 UTC (rev 316238) @@ -1,22 +0,0 @@ ---TEST-- -openbase_dir runtime tightning ---SKIPIF-- - ---EXPECT-- -string(10) "/usr/local" -string(14) "/usr/local/bin" -bool(false) -string(14) "/usr/local/bin" - Copied: php/php-src/trunk/tests/security/open_basedir_001.phpt (from rev 316236, php/php-src/trunk/ext/standard/tests/directory/open_basedir_001.phpt) === --- php/php-src/trunk/tests/security/open_basedir_001.phpt (rev 0) +++ php/php-src/trunk/tests/security/open_basedir_001.phpt 2011-09-06 09:23:10 UTC (rev 316238) @@ -0,0 +1,22 @@ +--TEST-- +openbase_dir runtime tightning +--SKIPIF-- + +--EXPECT-- +string(10) "/usr/local" +string(14) "/usr/local/bin" +bool(false) +string(14) "/usr/local/bin" + -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/iconv/tests/bug52211.phpt trunk/ext/iconv/tests/bug52211.phpt
On Tue, Sep 6, 2011 at 08:42, Pierre Joye wrote:
> pajoye Tue, 06 Sep 2011 06:42:11 +
>
> Revision: http://svn.php.net/viewvc?view=revision&revision=316212
>
> Log:
> - add skipif
>
> Changed paths:
> U php/php-src/branches/PHP_5_4/ext/iconv/tests/bug52211.phpt
> U php/php-src/trunk/ext/iconv/tests/bug52211.phpt
>
> Modified: php/php-src/branches/PHP_5_4/ext/iconv/tests/bug52211.phpt
> ===
> --- php/php-src/branches/PHP_5_4/ext/iconv/tests/bug52211.phpt 2011-09-06
> 06:34:36 UTC (rev 316211)
> +++ php/php-src/branches/PHP_5_4/ext/iconv/tests/bug52211.phpt 2011-09-06
> 06:42:11 UTC (rev 316212)
> @@ -1,5 +1,8 @@
> --TEST--
> Bug #52211 (iconv() returns part of string on error)
> + +include('skipif.inc');
> +?>
missing --SKIPIF--
Please be more careful when you are fixing the tests :(
-Hannes
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/tests/php_ini_loaded_file.phpt branches/PHP_5_4/ext/standard/tests/php_ini_loaded_file.phpt trunk/ext/standard/tests/php_ini_loaded_file.
On Tue, Sep 6, 2011 at 09:47, Pierre Joye wrote: > pajoye Tue, 06 Sep 2011 07:47:20 + > > Revision: http://svn.php.net/viewvc?view=revision&revision=316229 > > Log: > - fix test > > Changed paths: > U > php/php-src/branches/PHP_5_3/ext/standard/tests/php_ini_loaded_file.phpt > U > php/php-src/branches/PHP_5_4/ext/standard/tests/php_ini_loaded_file.phpt > U php/php-src/trunk/ext/standard/tests/php_ini_loaded_file.phpt > > Modified: > php/php-src/branches/PHP_5_3/ext/standard/tests/php_ini_loaded_file.phpt > === > --- php/php-src/branches/PHP_5_3/ext/standard/tests/php_ini_loaded_file.phpt > 2011-09-06 07:44:43 UTC (rev 316228) > +++ php/php-src/branches/PHP_5_3/ext/standard/tests/php_ini_loaded_file.phpt > 2011-09-06 07:47:20 UTC (rev 316229) > @@ -11,4 +11,4 @@ > var_dump(php_ini_loaded_file()); > ?> > --EXPECTF-- > -string(%d) "%s/tmp-php.ini" > +string(%d) "%sphp.ini" The tmp- part here is quite intentional, please leave it in. -Hanes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/sysvshm/tests/001.phpt branches/PHP_5_4/ext/sysvshm/tests/001.phpt trunk/ext/sysvshm/tests/001.phpt
On Tue, Sep 6, 2011 at 09:49, Pierre Joye wrote: > pajoye Tue, 06 Sep 2011 07:49:31 + > > Revision: http://svn.php.net/viewvc?view=revision&revision=316230 > > Log: > - add skipif > > Changed paths: > U php/php-src/branches/PHP_5_3/ext/sysvshm/tests/001.phpt > U php/php-src/branches/PHP_5_4/ext/sysvshm/tests/001.phpt > U php/php-src/trunk/ext/sysvshm/tests/001.phpt > > Modified: php/php-src/branches/PHP_5_3/ext/sysvshm/tests/001.phpt > === > --- php/php-src/branches/PHP_5_3/ext/sysvshm/tests/001.phpt 2011-09-06 > 07:47:20 UTC (rev 316229) > +++ php/php-src/branches/PHP_5_3/ext/sysvshm/tests/001.phpt 2011-09-06 > 07:49:31 UTC (rev 316230) > @@ -1,5 +1,7 @@ > --TEST-- > ftok() tests > +--SKIPIF-- > + ftok() is actually not part of syssvhm, its defined in the standard ext (ext/standard/ftok.c). -Hannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/iconv/tests/bug52211.phpt trunk/ext/iconv/tests/bug52211.phpt
pajoye Tue, 06 Sep 2011 09:28:23 + Revision: http://svn.php.net/viewvc?view=revision&revision=316239 Log: - missing --SKIPIF-- Changed paths: U php/php-src/branches/PHP_5_4/ext/iconv/tests/bug52211.phpt U php/php-src/trunk/ext/iconv/tests/bug52211.phpt Modified: php/php-src/branches/PHP_5_4/ext/iconv/tests/bug52211.phpt === --- php/php-src/branches/PHP_5_4/ext/iconv/tests/bug52211.phpt 2011-09-06 09:23:10 UTC (rev 316238) +++ php/php-src/branches/PHP_5_4/ext/iconv/tests/bug52211.phpt 2011-09-06 09:28:23 UTC (rev 316239) @@ -1,5 +1,6 @@ --TEST-- Bug #52211 (iconv() returns part of string on error) +--SKIPIF-- Modified: php/php-src/trunk/ext/iconv/tests/bug52211.phpt === --- php/php-src/trunk/ext/iconv/tests/bug52211.phpt 2011-09-06 09:23:10 UTC (rev 316238) +++ php/php-src/trunk/ext/iconv/tests/bug52211.phpt 2011-09-06 09:28:23 UTC (rev 316239) @@ -1,5 +1,6 @@ --TEST-- Bug #52211 (iconv() returns part of string on error) +--SKIPIF-- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/hash/tests/hash_copy_001.phpt branches/PHP_5_3/ext/hash/tests/hash_copy_002.phpt branches/PHP_5_4/ext/hash/tests/hash_copy_001.phpt branches/PHP_5_4/e
laruence Tue, 06 Sep 2011 09:29:04 + Revision: http://svn.php.net/viewvc?view=revision&revision=316240 Log: Add skipif Changed paths: U php/php-src/branches/PHP_5_3/ext/hash/tests/hash_copy_001.phpt U php/php-src/branches/PHP_5_3/ext/hash/tests/hash_copy_002.phpt U php/php-src/branches/PHP_5_4/ext/hash/tests/hash_copy_001.phpt U php/php-src/branches/PHP_5_4/ext/hash/tests/hash_copy_002.phpt U php/php-src/trunk/ext/hash/tests/hash_copy_001.phpt U php/php-src/trunk/ext/hash/tests/hash_copy_002.phpt Modified: php/php-src/branches/PHP_5_3/ext/hash/tests/hash_copy_001.phpt === --- php/php-src/branches/PHP_5_3/ext/hash/tests/hash_copy_001.phpt 2011-09-06 09:28:23 UTC (rev 316239) +++ php/php-src/branches/PHP_5_3/ext/hash/tests/hash_copy_001.phpt 2011-09-06 09:29:04 UTC (rev 316240) @@ -1,5 +1,7 @@ --TEST-- hash_copy() basic tests +--SKIPIF-- + --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/sysvshm/tests/001.phpt branches/PHP_5_4/ext/sysvshm/tests/001.phpt trunk/ext/sysvshm/tests/001.phpt
no idea but this test is in there and fails when the ext is not loadead, so I simply skip if the ext is not available. Feel free to move this test if its location is wrong. On Tue, Sep 6, 2011 at 11:27 AM, Hannes Magnusson wrote: > On Tue, Sep 6, 2011 at 09:49, Pierre Joye wrote: >> pajoye Tue, 06 Sep 2011 07:49:31 + >> >> Revision: http://svn.php.net/viewvc?view=revision&revision=316230 >> >> Log: >> - add skipif >> >> Changed paths: >> U php/php-src/branches/PHP_5_3/ext/sysvshm/tests/001.phpt >> U php/php-src/branches/PHP_5_4/ext/sysvshm/tests/001.phpt >> U php/php-src/trunk/ext/sysvshm/tests/001.phpt >> >> Modified: php/php-src/branches/PHP_5_3/ext/sysvshm/tests/001.phpt >> === >> --- php/php-src/branches/PHP_5_3/ext/sysvshm/tests/001.phpt 2011-09-06 >> 07:47:20 UTC (rev 316229) >> +++ php/php-src/branches/PHP_5_3/ext/sysvshm/tests/001.phpt 2011-09-06 >> 07:49:31 UTC (rev 316230) >> @@ -1,5 +1,7 @@ >> --TEST-- >> ftok() tests >> +--SKIPIF-- >> + > > > ftok() is actually not part of syssvhm, its defined in the standard > ext (ext/standard/ftok.c). > > > -Hannes > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > > -- Pierre @pierrejoye | 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] svn: /php/php-src/ branches/PHP_5_3/ext/standard/tests/php_ini_loaded_file.phpt branches/PHP_5_4/ext/standard/tests/php_ini_loaded_file.phpt trunk/ext/standard/tests/php_ini_loaded_file.
no, as it is not portable and can change. On Tue, Sep 6, 2011 at 11:25 AM, Hannes Magnusson wrote: > On Tue, Sep 6, 2011 at 09:47, Pierre Joye wrote: >> pajoye Tue, 06 Sep 2011 07:47:20 + >> >> Revision: http://svn.php.net/viewvc?view=revision&revision=316229 >> >> Log: >> - fix test >> >> Changed paths: >> U >> php/php-src/branches/PHP_5_3/ext/standard/tests/php_ini_loaded_file.phpt >> U >> php/php-src/branches/PHP_5_4/ext/standard/tests/php_ini_loaded_file.phpt >> U php/php-src/trunk/ext/standard/tests/php_ini_loaded_file.phpt >> >> Modified: >> php/php-src/branches/PHP_5_3/ext/standard/tests/php_ini_loaded_file.phpt >> === >> --- php/php-src/branches/PHP_5_3/ext/standard/tests/php_ini_loaded_file.phpt >> 2011-09-06 07:44:43 UTC (rev 316228) >> +++ php/php-src/branches/PHP_5_3/ext/standard/tests/php_ini_loaded_file.phpt >> 2011-09-06 07:47:20 UTC (rev 316229) >> @@ -11,4 +11,4 @@ >> var_dump(php_ini_loaded_file()); >> ?> >> --EXPECTF-- >> -string(%d) "%s/tmp-php.ini" >> +string(%d) "%sphp.ini" > > The tmp- part here is quite intentional, please leave it in. > > -Hanes > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > > -- Pierre @pierrejoye | 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] svn: /php/php-src/ branches/PHP_5_3/ext/sysvshm/tests/001.phpt branches/PHP_5_4/ext/sysvshm/tests/001.phpt trunk/ext/sysvshm/tests/001.phpt
Can you post the diff? I don't see any reason why it should fail.. -Hannes On Tue, Sep 6, 2011 at 11:29, Pierre Joye wrote: > no idea but this test is in there and fails when the ext is not > loadead, so I simply skip if the ext is not available. Feel free to > move this test if its location is wrong. > > On Tue, Sep 6, 2011 at 11:27 AM, Hannes Magnusson > wrote: >> On Tue, Sep 6, 2011 at 09:49, Pierre Joye wrote: >>> pajoye Tue, 06 Sep 2011 07:49:31 + >>> >>> Revision: http://svn.php.net/viewvc?view=revision&revision=316230 >>> >>> Log: >>> - add skipif >>> >>> Changed paths: >>> U php/php-src/branches/PHP_5_3/ext/sysvshm/tests/001.phpt >>> U php/php-src/branches/PHP_5_4/ext/sysvshm/tests/001.phpt >>> U php/php-src/trunk/ext/sysvshm/tests/001.phpt >>> >>> Modified: php/php-src/branches/PHP_5_3/ext/sysvshm/tests/001.phpt >>> === >>> --- php/php-src/branches/PHP_5_3/ext/sysvshm/tests/001.phpt 2011-09-06 >>> 07:47:20 UTC (rev 316229) >>> +++ php/php-src/branches/PHP_5_3/ext/sysvshm/tests/001.phpt 2011-09-06 >>> 07:49:31 UTC (rev 316230) >>> @@ -1,5 +1,7 @@ >>> --TEST-- >>> ftok() tests >>> +--SKIPIF-- >>> + >> >> >> ftok() is actually not part of syssvhm, its defined in the standard >> ext (ext/standard/ftok.c). >> >> >> -Hannes >> >> -- >> PHP CVS Mailing List (http://www.php.net/) >> To unsubscribe, visit: http://www.php.net/unsub.php >> >> > > > > -- > Pierre > > @pierrejoye | 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] svn: /php/php-src/ branches/PHP_5_3/ext/standard/tests/php_ini_loaded_file.phpt branches/PHP_5_4/ext/standard/tests/php_ini_loaded_file.phpt trunk/ext/standard/tests/php_ini_loaded_file.
tmp-php.ini is generated by the test suite. How is that not portable and why would that change? -Hannes On Tue, Sep 6, 2011 at 11:30, Pierre Joye wrote: > no, as it is not portable and can change. > > On Tue, Sep 6, 2011 at 11:25 AM, Hannes Magnusson > wrote: >> On Tue, Sep 6, 2011 at 09:47, Pierre Joye wrote: >>> pajoye Tue, 06 Sep 2011 07:47:20 + >>> >>> Revision: http://svn.php.net/viewvc?view=revision&revision=316229 >>> >>> Log: >>> - fix test >>> >>> Changed paths: >>> U >>> php/php-src/branches/PHP_5_3/ext/standard/tests/php_ini_loaded_file.phpt >>> U >>> php/php-src/branches/PHP_5_4/ext/standard/tests/php_ini_loaded_file.phpt >>> U php/php-src/trunk/ext/standard/tests/php_ini_loaded_file.phpt >>> >>> Modified: >>> php/php-src/branches/PHP_5_3/ext/standard/tests/php_ini_loaded_file.phpt >>> === >>> --- >>> php/php-src/branches/PHP_5_3/ext/standard/tests/php_ini_loaded_file.phpt >>> 2011-09-06 07:44:43 UTC (rev 316228) >>> +++ >>> php/php-src/branches/PHP_5_3/ext/standard/tests/php_ini_loaded_file.phpt >>> 2011-09-06 07:47:20 UTC (rev 316229) >>> @@ -11,4 +11,4 @@ >>> var_dump(php_ini_loaded_file()); >>> ?> >>> --EXPECTF-- >>> -string(%d) "%s/tmp-php.ini" >>> +string(%d) "%sphp.ini" >> >> The tmp- part here is quite intentional, please leave it in. >> >> -Hanes >> >> -- >> PHP CVS Mailing List (http://www.php.net/) >> To unsubscribe, visit: http://www.php.net/unsub.php >> >> > > > > -- > Pierre > > @pierrejoye | 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] svn: /php/php-src/ branches/PHP_5_3/ext/standard/tests/php_ini_loaded_file.phpt branches/PHP_5_4/ext/standard/tests/php_ini_loaded_file.phpt trunk/ext/standard/tests/php_ini_loaded_file.
it is generated by make test, not by run-tests.php, which is wrong as it then fails when not called using run-tests.php. All testing environment testing for regression will fail here as they don't call make test but run-tests.php. run-tests.php needs an option to create it then and it should be done only there. On Tue, Sep 6, 2011 at 11:32 AM, Hannes Magnusson wrote: > tmp-php.ini is generated by the test suite. How is that not portable > and why would that change? > > -Hannes > > On Tue, Sep 6, 2011 at 11:30, Pierre Joye wrote: >> no, as it is not portable and can change. >> >> On Tue, Sep 6, 2011 at 11:25 AM, Hannes Magnusson >> wrote: >>> On Tue, Sep 6, 2011 at 09:47, Pierre Joye wrote: pajoye Tue, 06 Sep 2011 07:47:20 + Revision: http://svn.php.net/viewvc?view=revision&revision=316229 Log: - fix test Changed paths: U php/php-src/branches/PHP_5_3/ext/standard/tests/php_ini_loaded_file.phpt U php/php-src/branches/PHP_5_4/ext/standard/tests/php_ini_loaded_file.phpt U php/php-src/trunk/ext/standard/tests/php_ini_loaded_file.phpt Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/php_ini_loaded_file.phpt === --- php/php-src/branches/PHP_5_3/ext/standard/tests/php_ini_loaded_file.phpt 2011-09-06 07:44:43 UTC (rev 316228) +++ php/php-src/branches/PHP_5_3/ext/standard/tests/php_ini_loaded_file.phpt 2011-09-06 07:47:20 UTC (rev 316229) @@ -11,4 +11,4 @@ var_dump(php_ini_loaded_file()); ?> --EXPECTF-- -string(%d) "%s/tmp-php.ini" +string(%d) "%sphp.ini" >>> >>> The tmp- part here is quite intentional, please leave it in. >>> >>> -Hanes >>> >>> -- >>> PHP CVS Mailing List (http://www.php.net/) >>> To unsubscribe, visit: http://www.php.net/unsub.php >>> >>> >> >> >> >> -- >> Pierre >> >> @pierrejoye | http://blog.thepimp.net | http://www.libgd.org >> > -- Pierre @pierrejoye | 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
[PHP-CVS] svn: /php/php-src/trunk/ext/sockets/tests/ socket_strerror.phpt
fa Tue, 06 Sep 2011 09:56:13 + Revision: http://svn.php.net/viewvc?view=revision&revision=316242 Log: Fixed ext/sockets/tests/socket_strerror.phpt So it seems a missing ) killed the test. Changed paths: U php/php-src/trunk/ext/sockets/tests/socket_strerror.phpt Modified: php/php-src/trunk/ext/sockets/tests/socket_strerror.phpt === --- php/php-src/trunk/ext/sockets/tests/socket_strerror.phpt2011-09-06 09:45:21 UTC (rev 316241) +++ php/php-src/trunk/ext/sockets/tests/socket_strerror.phpt2011-09-06 09:56:13 UTC (rev 316242) @@ -5,11 +5,11 @@ f...@php.net --SKIPIF-- --FILE-- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/ PHP_5_3/ext/sockets/tests/socket_strerror.phpt PHP_5_4/ext/sockets/tests/socket_strerror.phpt
fa Tue, 06 Sep 2011 11:15:23 + Revision: http://svn.php.net/viewvc?view=revision&revision=316245 Log: MFH: Fixed ext/sockets/tests/socket_strerror.phpt So it seems a missing ) killed the test. Changed paths: U php/php-src/branches/PHP_5_3/ext/sockets/tests/socket_strerror.phpt U php/php-src/branches/PHP_5_4/ext/sockets/tests/socket_strerror.phpt Modified: php/php-src/branches/PHP_5_3/ext/sockets/tests/socket_strerror.phpt === --- php/php-src/branches/PHP_5_3/ext/sockets/tests/socket_strerror.phpt 2011-09-06 10:34:59 UTC (rev 316244) +++ php/php-src/branches/PHP_5_3/ext/sockets/tests/socket_strerror.phpt 2011-09-06 11:15:23 UTC (rev 316245) @@ -5,10 +5,10 @@ f...@php.net --SKIPIF-- Modified: php/php-src/branches/PHP_5_4/ext/sockets/tests/socket_strerror.phpt === --- php/php-src/branches/PHP_5_4/ext/sockets/tests/socket_strerror.phpt 2011-09-06 10:34:59 UTC (rev 316244) +++ php/php-src/branches/PHP_5_4/ext/sockets/tests/socket_strerror.phpt 2011-09-06 11:15:23 UTC (rev 316245) @@ -5,10 +5,10 @@ f...@php.net --SKIPIF-- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/spl/tests/SplFileObject_fputcsv.phpt trunk/ext/spl/tests/SplFileObject_fputcsv.phpt
pajoye Tue, 06 Sep 2011 11:24:21 + Revision: http://svn.php.net/viewvc?view=revision&revision=316246 Log: - use a more portable name for the filename Changed paths: U php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileObject_fputcsv.phpt U php/php-src/trunk/ext/spl/tests/SplFileObject_fputcsv.phpt Modified: php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileObject_fputcsv.phpt === --- php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileObject_fputcsv.phpt 2011-09-06 11:15:23 UTC (rev 316245) +++ php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileObject_fputcsv.phpt 2011-09-06 11:24:21 UTC (rev 316246) @@ -2,7 +2,7 @@ SplFileObject::fputcsv(): functionality tests --FILE-- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/readline/readline_cli.c trunk/ext/readline/readline_cli.c
bjoriTue, 06 Sep 2011 11:28:34 +
Revision: http://svn.php.net/viewvc?view=revision&revision=316247
Log:
Mention which library php is using
Changed paths:
U php/php-src/branches/PHP_5_4/ext/readline/readline_cli.c
U php/php-src/trunk/ext/readline/readline_cli.c
Modified: php/php-src/branches/PHP_5_4/ext/readline/readline_cli.c
===
--- php/php-src/branches/PHP_5_4/ext/readline/readline_cli.c2011-09-06
11:24:21 UTC (rev 316246)
+++ php/php-src/branches/PHP_5_4/ext/readline/readline_cli.c2011-09-06
11:28:34 UTC (rev 316247)
@@ -743,6 +743,11 @@
PHP_MINFO_FUNCTION(cli_readline)
{
+ php_info_print_table_start();
+ php_info_print_table_header(2, "Readline Support", "enabled");
+ php_info_print_table_row(2, "Readline library", (rl_library_version ?
rl_library_version : "Unknown"));
+ php_info_print_table_end();
+
DISPLAY_INI_ENTRIES();
}
Modified: php/php-src/trunk/ext/readline/readline_cli.c
===
--- php/php-src/trunk/ext/readline/readline_cli.c 2011-09-06 11:24:21 UTC
(rev 316246)
+++ php/php-src/trunk/ext/readline/readline_cli.c 2011-09-06 11:28:34 UTC
(rev 316247)
@@ -743,6 +743,11 @@
PHP_MINFO_FUNCTION(cli_readline)
{
+ php_info_print_table_start();
+ php_info_print_table_header(2, "Readline Support", "enabled");
+ php_info_print_table_row(2, "Readline library", (rl_library_version ?
rl_library_version : "Unknown"));
+ php_info_print_table_end();
+
DISPLAY_INI_ENTRIES();
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/tests/php_ini_loaded_file.phpt branches/PHP_5_4/ext/standard/tests/php_ini_loaded_file.phpt trunk/ext/standard/tests/php_ini_loaded_file.
running run-tests.php without make test can still cause some tests to fail (even ext/standard/tests/php_ini_loaded_file.phpt), as there will be no ini file loaded (at least this is why I'm seeing on linux) so adding the option to create the tmp-php.ini through run-tests.php would be useful for me. On Tue, Sep 6, 2011 at 11:42 AM, Pierre Joye wrote: > it is generated by make test, not by run-tests.php, which is wrong as > it then fails when not called using run-tests.php. All testing > environment testing for regression will fail here as they don't call > make test but run-tests.php. run-tests.php needs an option to create > it then and it should be done only there. > > On Tue, Sep 6, 2011 at 11:32 AM, Hannes Magnusson > wrote: >> tmp-php.ini is generated by the test suite. How is that not portable >> and why would that change? >> >> -Hannes >> >> On Tue, Sep 6, 2011 at 11:30, Pierre Joye wrote: >>> no, as it is not portable and can change. >>> >>> On Tue, Sep 6, 2011 at 11:25 AM, Hannes Magnusson >>> wrote: On Tue, Sep 6, 2011 at 09:47, Pierre Joye wrote: > pajoye Tue, 06 Sep 2011 07:47:20 + > > Revision: http://svn.php.net/viewvc?view=revision&revision=316229 > > Log: > - fix test > > Changed paths: > U > php/php-src/branches/PHP_5_3/ext/standard/tests/php_ini_loaded_file.phpt > U > php/php-src/branches/PHP_5_4/ext/standard/tests/php_ini_loaded_file.phpt > U php/php-src/trunk/ext/standard/tests/php_ini_loaded_file.phpt > > Modified: > php/php-src/branches/PHP_5_3/ext/standard/tests/php_ini_loaded_file.phpt > === > --- > php/php-src/branches/PHP_5_3/ext/standard/tests/php_ini_loaded_file.phpt > 2011-09-06 07:44:43 UTC (rev 316228) > +++ > php/php-src/branches/PHP_5_3/ext/standard/tests/php_ini_loaded_file.phpt > 2011-09-06 07:47:20 UTC (rev 316229) > @@ -11,4 +11,4 @@ > var_dump(php_ini_loaded_file()); > ?> > --EXPECTF-- > -string(%d) "%s/tmp-php.ini" > +string(%d) "%sphp.ini" The tmp- part here is quite intentional, please leave it in. -Hanes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php >>> >>> >>> >>> -- >>> Pierre >>> >>> @pierrejoye | http://blog.thepimp.net | http://www.libgd.org >>> >> > > > > -- > Pierre > > @pierrejoye | 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 > > -- Ferenc Kovács @Tyr43l - http://tyrael.hu -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt trunk/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt
Am 06.09.2011 07:20, schrieb Stanislav Malyshev: stas Tue, 06 Sep 2011 05:20:51 + Revision: http://svn.php.net/viewvc?view=revision&revision=316205 Log: fix test FAIL LOAD DATA INFILE - open_basedir [ext/mysql/tests/mysql_query_load_data_openbasedir.phpt] > cat ext/mysql/tests/mysql_query_load_data_openbasedir.diff 001+ Warning: file_exists(): open_basedir restriction in effect. File(./simple.csv) is not within the allowed path(s): (/home/nixnutz/php/php-src/branches/PHP_5_4/ext/mysql/tests) in /home/nixnutz/php/php-src/branches/PHP_5_4/ext/mysql/tests/mysql_query_load_data_openbasedir.php on line 30 Ulf -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/zlib/tests/005.phpt branches/PHP_5_4/ext/zlib/tests/005.phpt trunk/ext/zlib/tests/005.phpt
pajoye Tue, 06 Sep 2011 12:24:16 + Revision: http://svn.php.net/viewvc?view=revision&revision=316251 Log: - force LF Changed paths: _U php/php-src/branches/PHP_5_3/ext/zlib/tests/005.phpt _U php/php-src/branches/PHP_5_4/ext/zlib/tests/005.phpt _U php/php-src/trunk/ext/zlib/tests/005.phpt Property changes on: php/php-src/branches/PHP_5_3/ext/zlib/tests/005.phpt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/branches/PHP_5_4/ext/zlib/tests/005.phpt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/trunk/ext/zlib/tests/005.phpt ___ Modified: svn:eol-style - native + LF -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/ PHP_5_3/ext/zlib/tests/003.phpt PHP_5_4/ext/zlib/tests/003.phpt
pajoye Tue, 06 Sep 2011 12:30:17 + Revision: http://svn.php.net/viewvc?view=revision&revision=316252 Log: - use only zlib function and reported the failure with base64 in #55620 Bug: https://bugs.php.net/55620 (Open) base64_encode failure Changed paths: U php/php-src/branches/PHP_5_3/ext/zlib/tests/003.phpt U php/php-src/branches/PHP_5_4/ext/zlib/tests/003.phpt Modified: php/php-src/branches/PHP_5_3/ext/zlib/tests/003.phpt === --- php/php-src/branches/PHP_5_3/ext/zlib/tests/003.phpt2011-09-06 12:24:16 UTC (rev 316251) +++ php/php-src/branches/PHP_5_3/ext/zlib/tests/003.phpt2011-09-06 12:30:17 UTC (rev 316252) @@ -1,13 +1,13 @@ --TEST-- -gzencode()/base64_encode() +gzencode() --SKIPIF-- --FILE-- --EXPECT-- 118 36864 Modified: php/php-src/branches/PHP_5_4/ext/zlib/tests/003.phpt === --- php/php-src/branches/PHP_5_4/ext/zlib/tests/003.phpt2011-09-06 12:24:16 UTC (rev 316251) +++ php/php-src/branches/PHP_5_4/ext/zlib/tests/003.phpt2011-09-06 12:30:17 UTC (rev 316252) @@ -1,13 +1,13 @@ --TEST-- -gzencode()/base64_encode() +gzencode() --SKIPIF-- --FILE-- --EXPECT-- 118 36864 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/zlib/tests/ 003.phpt
pajoye Tue, 06 Sep 2011 12:30:47 + Revision: http://svn.php.net/viewvc?view=revision&revision=316253 Log: - use only zlib function and reported the failure with base64 in #55620 Bug: https://bugs.php.net/55620 (Open) base64_encode failure Changed paths: U php/php-src/trunk/ext/zlib/tests/003.phpt Modified: php/php-src/trunk/ext/zlib/tests/003.phpt === --- php/php-src/trunk/ext/zlib/tests/003.phpt 2011-09-06 12:30:17 UTC (rev 316252) +++ php/php-src/trunk/ext/zlib/tests/003.phpt 2011-09-06 12:30:47 UTC (rev 316253) @@ -1,13 +1,13 @@ --TEST-- -gzencode()/base64_encode() +gzencode() --SKIPIF-- --FILE-- --EXPECT-- 118 36864 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt branches/PHP_5_4/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt trunk/ext/mysql/tests/mysql
uw Tue, 06 Sep 2011 12:58:01 + Revision: http://svn.php.net/viewvc?view=revision&revision=316255 Log: Reverting to proper --INI-- section usage. Improve SKIPIF to skip test if open_basedir setting is too restrictive during test run for whatever reason. Changed paths: U php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt U php/php-src/branches/PHP_5_4/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt U php/php-src/trunk/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt Modified: php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt === --- php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt 2011-09-06 12:42:14 UTC (rev 316254) +++ php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt 2011-09-06 12:58:01 UTC (rev 316255) @@ -2,10 +2,16 @@ LOAD DATA INFILE - open_basedir --SKIPIF-- +--INI-- +open_basedir="." --FILE-- +--INI-- +open_basedir="." --FILE-- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/sysvshm/tests/001.phpt branches/PHP_5_4/ext/sysvshm/tests/001.phpt trunk/ext/sysvshm/tests/001.phpt
Hi 2011/9/6 Hannes Magnusson : > Can you post the diff? > I don't see any reason why it should fail.. Windows for one does not implement a native ftok() function, and the general use with ftok() was together with sysvshm(). If we have such an implementation, it would make sense to enable sysvshm on Windows too. But back to subject, I agree that we should move both the function and tests if there is no other valuable uses for ftok() outside of that extension. -- regards, Kalle Sommer Nielsen ka...@php.net -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/standard/filestat.c trunk/ext/standard/filestat.c
Hi Stas 2011/9/6 Stanislav Malyshev : > stas Tue, 06 Sep 2011 05:31:08 + > > Revision: http://svn.php.net/viewvc?view=revision&revision=316208 We generally use PHP_WIN32 to check for Windows, but thats just a cosmetic :) -- regards, Kalle Sommer Nielsen ka...@php.net -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/ PHP_5_3/ext/zlib/tests/003.phpt PHP_5_4/ext/zlib/tests/003.phpt
On Tue, Sep 6, 2011 at 14:30, Pierre Joye wrote: > pajoye Tue, 06 Sep 2011 12:30:17 + > > Revision: http://svn.php.net/viewvc?view=revision&revision=316252 > > Log: > - use only zlib function and reported the failure with base64 in #55620 > > Bug: https://bugs.php.net/55620 (Open) base64_encode failure > > Changed paths: > U php/php-src/branches/PHP_5_3/ext/zlib/tests/003.phpt > U php/php-src/branches/PHP_5_4/ext/zlib/tests/003.phpt > trunk/ ? -Hannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/tests/connect.inc branches/PHP_5_4/ext/mysqli/tests/connect.inc trunk/ext/mysqli/tests/connect.inc
uw Tue, 06 Sep 2011 13:39:46 +
Revision: http://svn.php.net/viewvc?view=revision&revision=316257
Log:
Prevent Notice
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqli/tests/connect.inc
U php/php-src/branches/PHP_5_4/ext/mysqli/tests/connect.inc
U php/php-src/trunk/ext/mysqli/tests/connect.inc
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/connect.inc
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/connect.inc 2011-09-06
13:38:14 UTC (rev 316256)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/connect.inc 2011-09-06
13:39:46 UTC (rev 316257)
@@ -223,7 +223,7 @@
}
function have_innodb($link) {
- if ($res = $link->query("SHOW VARIABLES LIKE 'have_innodb'")
&&
+ if (($res = $link->query("SHOW VARIABLES LIKE
'have_innodb'")) &&
$row = $res->fetch_row() &&
!empty($row)) {
if ($row[1] == "DISABLED" || $row[1] == "NO") {
Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/connect.inc
===
--- php/php-src/branches/PHP_5_4/ext/mysqli/tests/connect.inc 2011-09-06
13:38:14 UTC (rev 316256)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/connect.inc 2011-09-06
13:39:46 UTC (rev 316257)
@@ -223,7 +223,7 @@
}
function have_innodb($link) {
- if ($res = $link->query("SHOW VARIABLES LIKE 'have_innodb'")
&&
+ if (($res = $link->query("SHOW VARIABLES LIKE
'have_innodb'")) &&
$row = $res->fetch_row() &&
!empty($row)) {
if ($row[1] == "DISABLED" || $row[1] == "NO") {
Modified: php/php-src/trunk/ext/mysqli/tests/connect.inc
===
--- php/php-src/trunk/ext/mysqli/tests/connect.inc 2011-09-06 13:38:14 UTC
(rev 316256)
+++ php/php-src/trunk/ext/mysqli/tests/connect.inc 2011-09-06 13:39:46 UTC
(rev 316257)
@@ -223,7 +223,7 @@
}
function have_innodb($link) {
- if ($res = $link->query("SHOW VARIABLES LIKE 'have_innodb'")
&&
+ if (($res = $link->query("SHOW VARIABLES LIKE
'have_innodb'")) &&
$row = $res->fetch_row() &&
!empty($row)) {
if ($row[1] == "DISABLED" || $row[1] == "NO") {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/tests/mysqli_autocommit_oo.phpt branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt branches/PHP_5_4/ext/mysqli/
uw Tue, 06 Sep 2011 13:50:45 +
Revision: http://svn.php.net/viewvc?view=revision&revision=316259
Log:
Fix SKIPIF
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_autocommit_oo.phpt
U
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt
U php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_autocommit_oo.phpt
U
php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt
U php/php-src/trunk/ext/mysqli/tests/mysqli_autocommit_oo.phpt
U
php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt
Modified:
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_autocommit_oo.phpt
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_autocommit_oo.phpt
2011-09-06 13:40:46 UTC (rev 316258)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_autocommit_oo.phpt
2011-09-06 13:50:45 UTC (rev 316259)
@@ -7,7 +7,7 @@
require_once('skipifconnectfailure.inc');
require_once('connect.inc');
- if (!$mysqli = new my_mysqli($host, $user, $passwd, $db, $port,
$socket)) {
+ if (!$link = new my_mysqli($host, $user, $passwd, $db, $port, $socket))
{
printf("skip Cannot connect to the server using host=%s,
user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
$host, $user, $db, $port, $socket);
exit(1);
Modified:
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt
===
---
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt
2011-09-06 13:40:46 UTC (rev 316258)
+++
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt
2011-09-06 13:50:45 UTC (rev 316259)
@@ -2,14 +2,17 @@
mysqli_set_local_infile_handler() - open basedir restrictions
--SKIPIF--
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql_interface.phpt branches/PHP_5_4/ext/pdo_mysql/tests/pdo_mysql_interface.phpt trunk/ext/pdo_mysql/tests/pdo_mysql_interface.p
uw Tue, 06 Sep 2011 13:57:03 + Revision: http://svn.php.net/viewvc?view=revision&revision=316260 Log: Fix SKIPIF Changed paths: U php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql_interface.phpt U php/php-src/branches/PHP_5_4/ext/pdo_mysql/tests/pdo_mysql_interface.phpt U php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql_interface.phpt Modified: php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql_interface.phpt === --- php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql_interface.phpt 2011-09-06 13:50:45 UTC (rev 316259) +++ php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql_interface.phpt 2011-09-06 13:57:03 UTC (rev 316260) @@ -4,7 +4,7 @@ Modified: php/php-src/branches/PHP_5_4/ext/pdo_mysql/tests/pdo_mysql_interface.phpt === --- php/php-src/branches/PHP_5_4/ext/pdo_mysql/tests/pdo_mysql_interface.phpt 2011-09-06 13:50:45 UTC (rev 316259) +++ php/php-src/branches/PHP_5_4/ext/pdo_mysql/tests/pdo_mysql_interface.phpt 2011-09-06 13:57:03 UTC (rev 316260) @@ -4,7 +4,7 @@ Modified: php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql_interface.phpt === --- php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql_interface.phpt 2011-09-06 13:50:45 UTC (rev 316259) +++ php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql_interface.phpt 2011-09-06 13:57:03 UTC (rev 316260) @@ -4,7 +4,7 @@ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/tests/mysqli_poll_reference.phpt branches/PHP_5_4/ext/mysqli/tests/mysqli_poll_reference.phpt trunk/ext/mysqli/tests/mysqli_poll_reference.phpt
uw Tue, 06 Sep 2011 14:47:57 +
Revision: http://svn.php.net/viewvc?view=revision&revision=316263
Log:
BORK hunting - Fixing SKIPIF
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_poll_reference.phpt
U php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_poll_reference.phpt
U php/php-src/trunk/ext/mysqli/tests/mysqli_poll_reference.phpt
Modified:
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_poll_reference.phpt
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_poll_reference.phpt
2011-09-06 14:45:44 UTC (rev 316262)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_poll_reference.phpt
2011-09-06 14:47:57 UTC (rev 316263)
@@ -13,7 +13,7 @@
if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
die("skip cannot connect");
-if (mysqli_server_version($link) < 50012)
+if (mysqli_get_server_version($link) < 50012)
die("skip Test needs SQL function SLEEP() available as of MySQL
5.0.12");
?>
Modified:
php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_poll_reference.phpt
===
--- php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_poll_reference.phpt
2011-09-06 14:45:44 UTC (rev 316262)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_poll_reference.phpt
2011-09-06 14:47:57 UTC (rev 316263)
@@ -13,7 +13,7 @@
if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
die("skip cannot connect");
-if (mysqli_server_version($link) < 50012)
+if (mysqli_get_server_version($link) < 50012)
die("skip Test needs SQL function SLEEP() available as of MySQL
5.0.12");
?>
Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_poll_reference.phpt
===
--- php/php-src/trunk/ext/mysqli/tests/mysqli_poll_reference.phpt
2011-09-06 14:45:44 UTC (rev 316262)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_poll_reference.phpt
2011-09-06 14:47:57 UTC (rev 316263)
@@ -13,7 +13,7 @@
if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
die("skip cannot connect");
-if (mysqli_server_version($link) < 50012)
+if (mysqli_get_server_version($link) < 50012)
die("skip Test needs SQL function SLEEP() available as of MySQL
5.0.12");
?>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/mysqlnd/mysqlnd_ps.c trunk/ext/mysqlnd/mysqlnd_ps.c
andrey Tue, 06 Sep 2011 14:48:43 +
Revision: http://svn.php.net/viewvc?view=revision&revision=316264
Log:
add query information to the trace log
Changed paths:
U php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_ps.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c
Modified: php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_ps.c
===
--- php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_ps.c 2011-09-06
14:47:57 UTC (rev 316263)
+++ php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_ps.c 2011-09-06
14:48:43 UTC (rev 316264)
@@ -385,6 +385,7 @@
DBG_RETURN(FAIL);
}
DBG_INF_FMT("stmt=%lu", stmt->stmt_id);
+ DBG_INF_FMT("query=%s", query);
SET_ERROR_AFF_ROWS(stmt);
SET_ERROR_AFF_ROWS(stmt->conn);
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c 2011-09-06 14:47:57 UTC (rev
316263)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c 2011-09-06 14:48:43 UTC (rev
316264)
@@ -385,6 +385,7 @@
DBG_RETURN(FAIL);
}
DBG_INF_FMT("stmt=%lu", stmt->stmt_id);
+ DBG_INF_FMT("query=%s", query);
SET_ERROR_AFF_ROWS(stmt);
SET_ERROR_AFF_ROWS(stmt->conn);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/NEWS branches/PHP_5_4/ext/readline/config.m4 branches/PHP_5_4/ext/readline/readline.c trunk/ext/readline/config.m4 trunk/ext/readline/readline.c
bjoriTue, 06 Sep 2011 15:07:24 +
Revision: http://svn.php.net/viewvc?view=revision&revision=316265
Log:
Fixed bug#54450 (callback function when built against libedit)
Bug: https://bugs.php.net/54450 (Assigned) Missing functions with libedit
Changed paths:
U php/php-src/branches/PHP_5_4/NEWS
U php/php-src/branches/PHP_5_4/ext/readline/config.m4
U php/php-src/branches/PHP_5_4/ext/readline/readline.c
U php/php-src/trunk/ext/readline/config.m4
U php/php-src/trunk/ext/readline/readline.c
Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS 2011-09-06 14:48:43 UTC (rev 316264)
+++ php/php-src/branches/PHP_5_4/NEWS 2011-09-06 15:07:24 UTC (rev 316265)
@@ -38,6 +38,10 @@
- Improved CLI SAPI:
. Added friendly log messages - Req #55109 (Arpad)
+- Improved readline extension:
+ . Fixed bug #54450 (Enable callback support when built against libedit).
+(fedora at famillecollet dot com, Hannes)
+
- Improved Session extension:
. Expose session status via new function, session_status (Req #52982) (Arpad)
Modified: php/php-src/branches/PHP_5_4/ext/readline/config.m4
===
--- php/php-src/branches/PHP_5_4/ext/readline/config.m4 2011-09-06 14:48:43 UTC
(rev 316264)
+++ php/php-src/branches/PHP_5_4/ext/readline/config.m4 2011-09-06 15:07:24 UTC
(rev 316265)
@@ -60,6 +60,13 @@
-L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
])
+ PHP_CHECK_LIBRARY(edit, rl_on_new_line,
+ [
+AC_DEFINE(HAVE_RL_ON_NEW_LINE, 1, [ ])
+ ],[],[
+-L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
+ ])
+
AC_DEFINE(HAVE_LIBREADLINE, 1, [ ])
elif test "$PHP_LIBEDIT" != "no"; then
@@ -93,6 +100,20 @@
-L$READLINE_DIR/$PHP_LIBDIR
])
+ PHP_CHECK_LIBRARY(edit, rl_callback_read_char,
+ [
+AC_DEFINE(HAVE_RL_CALLBACK_READ_CHAR, 1, [ ])
+ ],[],[
+-L$READLINE_DIR/$PHP_LIBDIR
+ ])
+
+ PHP_CHECK_LIBRARY(edit, rl_on_new_line,
+ [
+AC_DEFINE(HAVE_RL_ON_NEW_LINE, 1, [ ])
+ ],[],[
+-L$READLINE_DIR/$PHP_LIBDIR
+ ])
+
AC_DEFINE(HAVE_LIBEDIT, 1, [ ])
fi
Modified: php/php-src/branches/PHP_5_4/ext/readline/readline.c
===
--- php/php-src/branches/PHP_5_4/ext/readline/readline.c2011-09-06
14:48:43 UTC (rev 316264)
+++ php/php-src/branches/PHP_5_4/ext/readline/readline.c2011-09-06
15:07:24 UTC (rev 316265)
@@ -144,6 +144,8 @@
PHP_FE(readline_callback_read_char,
arginfo_readline_callback_read_char)
PHP_FE(readline_callback_handler_remove,
arginfo_readline_callback_handler_remove)
PHP_FE(readline_redisplay, arginfo_readline_redisplay)
+#endif
+#if HAVE_RL_ON_NEW_LINE
PHP_FE(readline_on_new_line, arginfo_readline_on_new_line)
#endif
PHP_FE_END
@@ -617,6 +619,9 @@
}
/* }}} */
+#endif
+
+#if HAVE_RL_ON_NEW_LINE
/* {{{ proto void readline_on_new_line(void)
Inform readline that the cursor has moved to a new line */
PHP_FUNCTION(readline_on_new_line)
Modified: php/php-src/trunk/ext/readline/config.m4
===
--- php/php-src/trunk/ext/readline/config.m42011-09-06 14:48:43 UTC (rev
316264)
+++ php/php-src/trunk/ext/readline/config.m42011-09-06 15:07:24 UTC (rev
316265)
@@ -60,6 +60,13 @@
-L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
])
+ PHP_CHECK_LIBRARY(edit, rl_on_new_line,
+ [
+AC_DEFINE(HAVE_RL_ON_NEW_LINE, 1, [ ])
+ ],[],[
+-L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
+ ])
+
AC_DEFINE(HAVE_LIBREADLINE, 1, [ ])
elif test "$PHP_LIBEDIT" != "no"; then
@@ -93,6 +100,20 @@
-L$READLINE_DIR/$PHP_LIBDIR
])
+ PHP_CHECK_LIBRARY(edit, rl_callback_read_char,
+ [
+AC_DEFINE(HAVE_RL_CALLBACK_READ_CHAR, 1, [ ])
+ ],[],[
+-L$READLINE_DIR/$PHP_LIBDIR
+ ])
+
+ PHP_CHECK_LIBRARY(edit, rl_on_new_line,
+ [
+AC_DEFINE(HAVE_RL_ON_NEW_LINE, 1, [ ])
+ ],[],[
+-L$READLINE_DIR/$PHP_LIBDIR
+ ])
+
AC_DEFINE(HAVE_LIBEDIT, 1, [ ])
fi
Modified: php/php-src/trunk/ext/readline/readline.c
===
--- php/php-src/trunk/ext/readline/readline.c 2011-09-06 14:48:43 UTC (rev
316264)
+++ php/php-src/trunk/ext/readline/readline.c 2011-09-06 15:07:24 UTC (rev
316265)
@@ -144,6 +144,8 @@
PHP_FE(readline_callback_read_char,
arginfo_readline_callback_read_char)
PHP_FE(readline_callback_handler_remove,
arginfo_readline_callback_handler_remove)
PHP_FE(readline_redisplay, arginfo_readline_redisplay)
+#endif
+#if HAVE_RL_ON_NEW_LINE
PHP_FE(readline_on_new_line, arginfo_readline_on_new_line)
#endif
PHP_FE_END
@@ -617,6 +619,9 @@
}
/* }}} */
+#endif
+
+#if HAVE_RL_ON_NEW_LINE
/* {{{ pro
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/readline/readline_cli.c trunk/ext/readline/readline_cli.c
bjoriTue, 06 Sep 2011 15:09:15 +
Revision: http://svn.php.net/viewvc?view=revision&revision=316266
Log:
Add a constant, READLINE_LIB, to be able to differenciate which lib is being
used
Changed paths:
U php/php-src/branches/PHP_5_4/ext/readline/readline_cli.c
U php/php-src/trunk/ext/readline/readline_cli.c
Modified: php/php-src/branches/PHP_5_4/ext/readline/readline_cli.c
===
--- php/php-src/branches/PHP_5_4/ext/readline/readline_cli.c2011-09-06
15:07:24 UTC (rev 316265)
+++ php/php-src/branches/PHP_5_4/ext/readline/readline_cli.c2011-09-06
15:09:15 UTC (rev 316266)
@@ -715,6 +715,12 @@
ZEND_INIT_MODULE_GLOBALS(cli_readline, cli_readline_init_globals, NULL);
REGISTER_INI_ENTRIES();
+#if HAVE_LIBEDIT
+ REGISTER_STRING_CONSTANT("READLINE_LIB", "libedit",
CONST_CS|CONST_PERSISTENT);
+#else
+ REGISTER_STRING_CONSTANT("READLINE_LIB", "readline",
CONST_CS|CONST_PERSISTENT);
+#endif
+
GET_SHELL_CB(cb);
if (cb) {
cb->cli_shell_write = readline_shell_write;
Modified: php/php-src/trunk/ext/readline/readline_cli.c
===
--- php/php-src/trunk/ext/readline/readline_cli.c 2011-09-06 15:07:24 UTC
(rev 316265)
+++ php/php-src/trunk/ext/readline/readline_cli.c 2011-09-06 15:09:15 UTC
(rev 316266)
@@ -715,6 +715,12 @@
ZEND_INIT_MODULE_GLOBALS(cli_readline, cli_readline_init_globals, NULL);
REGISTER_INI_ENTRIES();
+#if HAVE_LIBEDIT
+ REGISTER_STRING_CONSTANT("READLINE_LIB", "libedit",
CONST_CS|CONST_PERSISTENT);
+#else
+ REGISTER_STRING_CONSTANT("READLINE_LIB", "readline",
CONST_CS|CONST_PERSISTENT);
+#endif
+
GET_SHELL_CB(cb);
if (cb) {
cb->cli_shell_write = readline_shell_write;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/Zend/tests/bug31683.phpt branches/PHP_5_4/Zend/tests/bug31683.phpt trunk/Zend/tests/bug31683.phpt
pajoye Tue, 06 Sep 2011 15:40:12 + Revision: http://svn.php.net/viewvc?view=revision&revision=316269 Log: - fix skipif Changed paths: U php/php-src/branches/PHP_5_3/Zend/tests/bug31683.phpt U php/php-src/branches/PHP_5_4/Zend/tests/bug31683.phpt U php/php-src/trunk/Zend/tests/bug31683.phpt Modified: php/php-src/branches/PHP_5_3/Zend/tests/bug31683.phpt === --- php/php-src/branches/PHP_5_3/Zend/tests/bug31683.phpt 2011-09-06 15:30:02 UTC (rev 316268) +++ php/php-src/branches/PHP_5_3/Zend/tests/bug31683.phpt 2011-09-06 15:40:12 UTC (rev 316269) @@ -1,7 +1,5 @@ --TEST-- Bug #31683 (changes to $name in __get($name) override future parameters) ---SKIPIF-- - --FILE-- --FILE-- --FILE-- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/tests/strings/md5_file.phpt branches/PHP_5_3/ext/standard/tests/strings/sha1_file.phpt branches/PHP_5_4/ext/standard/tests/strings/md5_file.p
pajoye Tue, 06 Sep 2011 15:49:28 + Revision: http://svn.php.net/viewvc?view=revision&revision=316271 Log: - useless skipif Changed paths: U php/php-src/branches/PHP_5_3/ext/standard/tests/strings/md5_file.phpt U php/php-src/branches/PHP_5_3/ext/standard/tests/strings/sha1_file.phpt U php/php-src/branches/PHP_5_4/ext/standard/tests/strings/md5_file.phpt U php/php-src/branches/PHP_5_4/ext/standard/tests/strings/sha1_file.phpt U php/php-src/trunk/ext/standard/tests/strings/sha1_file.phpt Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/md5_file.phpt === --- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/md5_file.phpt 2011-09-06 15:42:21 UTC (rev 316270) +++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/md5_file.phpt 2011-09-06 15:49:28 UTC (rev 316271) @@ -1,17 +1,5 @@ --TEST-- Test md5_file() function with ASCII output and raw binary output ---SKIPIF-- --- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/tests/connect.inc branches/PHP_5_4/ext/mysqli/tests/connect.inc trunk/ext/mysqli/tests/connect.inc
uw Tue, 06 Sep 2011 16:13:03 +
Revision: http://svn.php.net/viewvc?view=revision&revision=316278
Log:
More parenthesis, credits to Nikita Popov
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqli/tests/connect.inc
U php/php-src/branches/PHP_5_4/ext/mysqli/tests/connect.inc
U php/php-src/trunk/ext/mysqli/tests/connect.inc
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/connect.inc
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/connect.inc 2011-09-06
16:10:11 UTC (rev 316277)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/connect.inc 2011-09-06
16:13:03 UTC (rev 316278)
@@ -224,7 +224,7 @@
function have_innodb($link) {
if (($res = $link->query("SHOW VARIABLES LIKE
'have_innodb'")) &&
- $row = $res->fetch_row() &&
+ ($row = $res->fetch_row()) &&
!empty($row)) {
if ($row[1] == "DISABLED" || $row[1] == "NO") {
return false;
Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/connect.inc
===
--- php/php-src/branches/PHP_5_4/ext/mysqli/tests/connect.inc 2011-09-06
16:10:11 UTC (rev 316277)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/connect.inc 2011-09-06
16:13:03 UTC (rev 316278)
@@ -224,7 +224,7 @@
function have_innodb($link) {
if (($res = $link->query("SHOW VARIABLES LIKE
'have_innodb'")) &&
- $row = $res->fetch_row() &&
+ ($row = $res->fetch_row()) &&
!empty($row)) {
if ($row[1] == "DISABLED" || $row[1] == "NO") {
return false;
Modified: php/php-src/trunk/ext/mysqli/tests/connect.inc
===
--- php/php-src/trunk/ext/mysqli/tests/connect.inc 2011-09-06 16:10:11 UTC
(rev 316277)
+++ php/php-src/trunk/ext/mysqli/tests/connect.inc 2011-09-06 16:13:03 UTC
(rev 316278)
@@ -224,7 +224,7 @@
function have_innodb($link) {
if (($res = $link->query("SHOW VARIABLES LIKE
'have_innodb'")) &&
- $row = $res->fetch_row() &&
+ ($row = $res->fetch_row()) &&
!empty($row)) {
if ($row[1] == "DISABLED" || $row[1] == "NO") {
return false;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/phar/tests/fopen_edgecases2.phpt branches/PHP_5_4/ext/phar/tests/fopen_edgecases2.phpt trunk/ext/phar/tests/fopen_edgecases2.phpt
uw Tue, 06 Sep 2011 16:30:53 +
Revision: http://svn.php.net/viewvc?view=revision&revision=316279
Log:
Fixing SKIPIF fatal error. 6.0 is history, thus SKIPIF might need further
updates?
Changed paths:
U php/php-src/branches/PHP_5_3/ext/phar/tests/fopen_edgecases2.phpt
U php/php-src/branches/PHP_5_4/ext/phar/tests/fopen_edgecases2.phpt
U php/php-src/trunk/ext/phar/tests/fopen_edgecases2.phpt
Modified: php/php-src/branches/PHP_5_3/ext/phar/tests/fopen_edgecases2.phpt
===
--- php/php-src/branches/PHP_5_3/ext/phar/tests/fopen_edgecases2.phpt
2011-09-06 16:13:03 UTC (rev 316278)
+++ php/php-src/branches/PHP_5_3/ext/phar/tests/fopen_edgecases2.phpt
2011-09-06 16:30:53 UTC (rev 316279)
@@ -2,7 +2,7 @@
Phar: test edge cases of fopen() function interception #2
--SKIPIF--
-=')) die('skip parameter
parsing changed in 6.0'); ?>
+=')) die('skip parameter
parsing changed in 6.0'); ?>
--INI--
phar.readonly=0
--FILE--
Modified: php/php-src/branches/PHP_5_4/ext/phar/tests/fopen_edgecases2.phpt
===
--- php/php-src/branches/PHP_5_4/ext/phar/tests/fopen_edgecases2.phpt
2011-09-06 16:13:03 UTC (rev 316278)
+++ php/php-src/branches/PHP_5_4/ext/phar/tests/fopen_edgecases2.phpt
2011-09-06 16:30:53 UTC (rev 316279)
@@ -2,7 +2,7 @@
Phar: test edge cases of fopen() function interception #2
--SKIPIF--
-=')) die('skip parameter
parsing changed in 6.0'); ?>
+=')) die('skip parameter
parsing changed in 6.0'); ?>
--INI--
phar.readonly=0
--FILE--
Modified: php/php-src/trunk/ext/phar/tests/fopen_edgecases2.phpt
===
--- php/php-src/trunk/ext/phar/tests/fopen_edgecases2.phpt 2011-09-06
16:13:03 UTC (rev 316278)
+++ php/php-src/trunk/ext/phar/tests/fopen_edgecases2.phpt 2011-09-06
16:30:53 UTC (rev 316279)
@@ -2,7 +2,7 @@
Phar: test edge cases of fopen() function interception #2
--SKIPIF--
-=')) die('skip parameter
parsing changed in 6.0'); ?>
+=')) die('skip parameter
parsing changed in 6.0'); ?>
--INI--
phar.readonly=0
--FILE--
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/posix/tests/posix_getpgid_error.phpt branches/PHP_5_4/ext/posix/tests/posix_getpgid_error.phpt trunk/ext/posix/tests/posix_getpgid_error.phpt
uw Tue, 06 Sep 2011 16:37:45 + Revision: http://svn.php.net/viewvc?view=revision&revision=316280 Log: Fixing SKIPIF Changed paths: U php/php-src/branches/PHP_5_3/ext/posix/tests/posix_getpgid_error.phpt U php/php-src/branches/PHP_5_4/ext/posix/tests/posix_getpgid_error.phpt U php/php-src/trunk/ext/posix/tests/posix_getpgid_error.phpt Modified: php/php-src/branches/PHP_5_3/ext/posix/tests/posix_getpgid_error.phpt === --- php/php-src/branches/PHP_5_3/ext/posix/tests/posix_getpgid_error.phpt 2011-09-06 16:30:53 UTC (rev 316279) +++ php/php-src/branches/PHP_5_3/ext/posix/tests/posix_getpgid_error.phpt 2011-09-06 16:37:45 UTC (rev 316280) @@ -2,7 +2,7 @@ Test posix_getpgid() function : error conditions --SKIPIF-- Modified: php/php-src/branches/PHP_5_4/ext/posix/tests/posix_getpgid_error.phpt === --- php/php-src/branches/PHP_5_4/ext/posix/tests/posix_getpgid_error.phpt 2011-09-06 16:30:53 UTC (rev 316279) +++ php/php-src/branches/PHP_5_4/ext/posix/tests/posix_getpgid_error.phpt 2011-09-06 16:37:45 UTC (rev 316280) @@ -2,7 +2,7 @@ Test posix_getpgid() function : error conditions --SKIPIF-- Modified: php/php-src/trunk/ext/posix/tests/posix_getpgid_error.phpt === --- php/php-src/trunk/ext/posix/tests/posix_getpgid_error.phpt 2011-09-06 16:30:53 UTC (rev 316279) +++ php/php-src/trunk/ext/posix/tests/posix_getpgid_error.phpt 2011-09-06 16:37:45 UTC (rev 316280) @@ -2,7 +2,7 @@ Test posix_getpgid() function : error conditions --SKIPIF-- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/mysqlnd/config9.m4 branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c branches/PHP_5_4/ext/mysqlnd/config9.m4 branches/PHP_5_4/ext/mysql
johannes Tue, 06 Sep 2011 16:38:22 +
Revision: http://svn.php.net/viewvc?view=revision&revision=316281
Log:
- Fix bug #55609 (mysqlnd cannot be built shared)
# This adds an option --enable-mysqlnd to explicitly built mysqlnd, like any
# other extension it can be used with =shared to build mysqlnd shared;
# mysqlnd will implicitly enabled when requested from another extension
Bug: https://bugs.php.net/55609 (Assigned) mysqlnd cannot be built shared
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4
U php/php-src/branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c
U php/php-src/branches/PHP_5_4/ext/mysqlnd/config9.m4
U php/php-src/branches/PHP_5_4/ext/mysqlnd/php_mysqlnd.c
U php/php-src/trunk/ext/mysqlnd/config9.m4
U php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2011-09-06 16:37:45 UTC (rev 316280)
+++ php/php-src/branches/PHP_5_3/NEWS 2011-09-06 16:38:22 UTC (rev 316281)
@@ -23,6 +23,7 @@
mysqlnd is used). (Andrey)
- mysqlnd
+ . Fixed bug #55609 (mysqlnd cannot be built shared). (Johannes)
. Fixed bug #55067 (MySQL doesn't support compression - wrong config option).
(Andrey)
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4 2011-09-06 16:37:45 UTC
(rev 316280)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4 2011-09-06 16:38:22 UTC
(rev 316281)
@@ -2,6 +2,9 @@
dnl $Id$
dnl config.m4 for mysqlnd driver
+PHP_ARG_ENABLE(mysqlnd, whether to enable mysqlnd,
+ [ --enable-mysqlnd Enable mysqlnd expliciely, will be done implicitly
+ when required by other extensions], no, yes)
PHP_ARG_ENABLE(mysqlnd_compression_support, whether to disable compressed
protocol support in mysqlnd,
[ --disable-mysqlnd-compression-support
@@ -13,7 +16,7 @@
fi
dnl If some extension uses mysqlnd it will get compiled in PHP core
-if test "$PHP_MYSQLND_ENABLED" = "yes"; then
+if test "$PHP_MYSQLND" != "no" || test "$PHP_MYSQLND_ENABLED" = "yes"; then
mysqlnd_ps_sources="mysqlnd_ps.c mysqlnd_ps_codec.c"
mysqlnd_base_sources="mysqlnd.c mysqlnd_charset.c mysqlnd_wireprotocol.c \
mysqlnd_loaddata.c mysqlnd_net.c mysqlnd_statistics.c \
@@ -27,12 +30,12 @@
AC_DEFINE([MYSQLND_SSL_SUPPORTED], 1, [Enable SSL support])
mysqlnd_sources="$mysqlnd_base_sources $mysqlnd_ps_sources"
- PHP_NEW_EXTENSION(mysqlnd, $mysqlnd_sources, no)
+ PHP_NEW_EXTENSION(mysqlnd, $mysqlnd_sources, $ext_shared)
PHP_ADD_BUILD_DIR([ext/mysqlnd], 1)
PHP_INSTALL_HEADERS([ext/mysqlnd/])
fi
-if test "$PHP_MYSQLND_ENABLED" = "yes" || test "$PHP_MYSQLI" != "no"; then
+if test "$PHP_MYSQLND" != "no" || test "$PHP_MYSQLND_ENABLED" = "yes" || test
"$PHP_MYSQLI" != "no"; then
PHP_ADD_BUILD_DIR([ext/mysqlnd], 1)
dnl This creates a file so it has to be after above macros
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c 2011-09-06
16:37:45 UTC (rev 316280)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c 2011-09-06
16:38:22 UTC (rev 316281)
@@ -299,6 +299,11 @@
};
/* }}} */
+/* {{{ COMPILE_DL_MYSQLND */
+#ifdef COMPILE_DL_MYSQLND
+ZEND_GET_MODULE(mysqlnd)
+#endif
+/* }}} */
/*
* Local variables:
Modified: php/php-src/branches/PHP_5_4/ext/mysqlnd/config9.m4
===
--- php/php-src/branches/PHP_5_4/ext/mysqlnd/config9.m4 2011-09-06 16:37:45 UTC
(rev 316280)
+++ php/php-src/branches/PHP_5_4/ext/mysqlnd/config9.m4 2011-09-06 16:38:22 UTC
(rev 316281)
@@ -2,6 +2,9 @@
dnl $Id$
dnl config.m4 for mysqlnd driver
+PHP_ARG_ENABLE(mysqlnd, whether to enable mysqlnd,
+ [ --enable-mysqlnd Enable mysqlnd expliciely, will be done implicitly
+ when required by other extensions], no, yes)
PHP_ARG_ENABLE(mysqlnd_compression_support, whether to disable compressed
protocol support in mysqlnd,
[ --disable-mysqlnd-compression-support
@@ -13,7 +16,7 @@
fi
dnl If some extension uses mysqlnd it will get compiled in PHP core
-if test "$PHP_MYSQLND_ENABLED" = "yes"; then
+if test "$PHP_MYSQLND" != "no" || test "$PHP_MYSQLND_ENABLED" = "yes"; then
mysqlnd_ps_sources="mysqlnd_ps.c mysqlnd_ps_codec.c"
mysqlnd_base_sources="mysqlnd.c mysqlnd_alloc.c mysqlnd_bt.c
mysqlnd_charset.c mysqlnd_wireprotocol.c \
mysqlnd_loaddata.c mysqlnd_net.c \
@@ -28,12 +31,12 @@
AC_DEFINE([MYSQLND_SSL_SUPPORTED], 1, [Enable SSL support])
mysqlnd_sources="$mysqlnd_base_sources $mysqlnd_ps_sources"
- PHP
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/posix/tests/posix_getpgid_variation.phpt branches/PHP_5_4/ext/posix/tests/posix_getpgid_variation.phpt trunk/ext/posix/tests/posix_getpgid_variation.p
uw Tue, 06 Sep 2011 16:39:55 + Revision: http://svn.php.net/viewvc?view=revision&revision=316282 Log: Fixing SKIPIF Changed paths: U php/php-src/branches/PHP_5_3/ext/posix/tests/posix_getpgid_variation.phpt U php/php-src/branches/PHP_5_4/ext/posix/tests/posix_getpgid_variation.phpt U php/php-src/trunk/ext/posix/tests/posix_getpgid_variation.phpt Modified: php/php-src/branches/PHP_5_3/ext/posix/tests/posix_getpgid_variation.phpt === --- php/php-src/branches/PHP_5_3/ext/posix/tests/posix_getpgid_variation.phpt 2011-09-06 16:38:22 UTC (rev 316281) +++ php/php-src/branches/PHP_5_3/ext/posix/tests/posix_getpgid_variation.phpt 2011-09-06 16:39:55 UTC (rev 316282) @@ -2,7 +2,7 @@ Test posix_getpgid() function : variation --SKIPIF-- Modified: php/php-src/branches/PHP_5_4/ext/posix/tests/posix_getpgid_variation.phpt === --- php/php-src/branches/PHP_5_4/ext/posix/tests/posix_getpgid_variation.phpt 2011-09-06 16:38:22 UTC (rev 316281) +++ php/php-src/branches/PHP_5_4/ext/posix/tests/posix_getpgid_variation.phpt 2011-09-06 16:39:55 UTC (rev 316282) @@ -2,7 +2,7 @@ Test posix_getpgid() function : variation --SKIPIF-- Modified: php/php-src/trunk/ext/posix/tests/posix_getpgid_variation.phpt === --- php/php-src/trunk/ext/posix/tests/posix_getpgid_variation.phpt 2011-09-06 16:38:22 UTC (rev 316281) +++ php/php-src/trunk/ext/posix/tests/posix_getpgid_variation.phpt 2011-09-06 16:39:55 UTC (rev 316282) @@ -2,7 +2,7 @@ Test posix_getpgid() function : variation --SKIPIF-- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt trunk/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt
Hi! On 9/6/11 5:11 AM, Ulf Wendel wrote: Am 06.09.2011 07:20, schrieb Stanislav Malyshev: stas Tue, 06 Sep 2011 05:20:51 + Revision: http://svn.php.net/viewvc?view=revision&revision=316205 Log: fix test FAIL LOAD DATA INFILE - open_basedir [ext/mysql/tests/mysql_query_load_data_openbasedir.phpt] I do not think your change to this test is right. You just skipped out this test for every run that is not done with exactly correct directory. This is not right. Instead, you should fix the paths so that they work independently of how the test is run. -- Stanislav Malyshev, Software Architect SugarCRM: http://www.sugarcrm.com/ (408)454-6900 ext. 227 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/standard/tests/strings/ md5_file.phpt
pajoye Tue, 06 Sep 2011 17:10:16 + Revision: http://svn.php.net/viewvc?view=revision&revision=316284 Log: - useless skipif Changed paths: U php/php-src/trunk/ext/standard/tests/strings/md5_file.phpt Modified: php/php-src/trunk/ext/standard/tests/strings/md5_file.phpt === --- php/php-src/trunk/ext/standard/tests/strings/md5_file.phpt 2011-09-06 16:48:54 UTC (rev 316283) +++ php/php-src/trunk/ext/standard/tests/strings/md5_file.phpt 2011-09-06 17:10:16 UTC (rev 316284) @@ -1,17 +1,5 @@ --TEST-- Test md5_file() function with ASCII output and raw binary output ---SKIPIF-- --- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt trunk/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt
Am 06.09.2011 19:05, schrieb Stas Malyshev: Hi! On 9/6/11 5:11 AM, Ulf Wendel wrote: Am 06.09.2011 07:20, schrieb Stanislav Malyshev: stas Tue, 06 Sep 2011 05:20:51 + Revision: http://svn.php.net/viewvc?view=revision&revision=316205 Log: fix test FAIL LOAD DATA INFILE - open_basedir [ext/mysql/tests/mysql_query_load_data_openbasedir.phpt] I do not think your change to this test is right. You just skipped out this test for every run that is not done with exactly correct directory. This is not right. Instead, you should fix the paths so that they work independently of how the test is run. I prefer SKIP over FAIL introduced by you. If you have proper patch, go ahead. Ulf -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/basic_functions.c branches/PHP_5_4/ext/standard/basic_functions.c trunk/ext/standard/basic_functions.c
pajoye Tue, 06 Sep 2011 17:41:08 +
Revision: http://svn.php.net/viewvc?view=revision&revision=316285
Log:
- fix #55622, mem corruption on large input
Bug: https://bugs.php.net/55622 (error getting bug information)
Changed paths:
U php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c
U php/php-src/branches/PHP_5_4/ext/standard/basic_functions.c
U php/php-src/trunk/ext/standard/basic_functions.c
Modified: php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c 2011-09-06
17:10:16 UTC (rev 316284)
+++ php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c 2011-09-06
17:41:08 UTC (rev 316285)
@@ -6022,7 +6022,7 @@
PHP_FUNCTION(parse_ini_string)
{
char *string = NULL, *str = NULL;
- int str_len = 0;
+ size_t str_len = 0;
zend_bool process_sections = 0;
long scanner_mode = ZEND_INI_SCANNER_NORMAL;
zend_ini_parser_cb_t ini_parser_cb;
Modified: php/php-src/branches/PHP_5_4/ext/standard/basic_functions.c
===
--- php/php-src/branches/PHP_5_4/ext/standard/basic_functions.c 2011-09-06
17:10:16 UTC (rev 316284)
+++ php/php-src/branches/PHP_5_4/ext/standard/basic_functions.c 2011-09-06
17:41:08 UTC (rev 316285)
@@ -5903,7 +5903,7 @@
PHP_FUNCTION(parse_ini_string)
{
char *string = NULL, *str = NULL;
- int str_len = 0;
+ size_t str_len = 0;
zend_bool process_sections = 0;
long scanner_mode = ZEND_INI_SCANNER_NORMAL;
zend_ini_parser_cb_t ini_parser_cb;
Modified: php/php-src/trunk/ext/standard/basic_functions.c
===
--- php/php-src/trunk/ext/standard/basic_functions.c2011-09-06 17:10:16 UTC
(rev 316284)
+++ php/php-src/trunk/ext/standard/basic_functions.c2011-09-06 17:41:08 UTC
(rev 316285)
@@ -5938,7 +5938,7 @@
PHP_FUNCTION(parse_ini_string)
{
char *string = NULL, *str = NULL;
- int str_len = 0;
+ size_t str_len = 0;
zend_bool process_sections = 0;
long scanner_mode = ZEND_INI_SCANNER_NORMAL;
zend_ini_parser_cb_t ini_parser_cb;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt trunk/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt
stas Tue, 06 Sep 2011 19:51:35 + Revision: http://svn.php.net/viewvc?view=revision&revision=316288 Log: improve open_basedir handling Changed paths: U php/php-src/branches/PHP_5_4/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt U php/php-src/trunk/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt Modified: php/php-src/branches/PHP_5_4/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt === --- php/php-src/branches/PHP_5_4/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt 2011-09-06 18:09:16 UTC (rev 316287) +++ php/php-src/branches/PHP_5_4/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt 2011-09-06 19:51:35 UTC (rev 316288) @@ -3,11 +3,6 @@ --SKIPIF-- ---INI-- -open_basedir="." --FILE-- ---INI-- -open_basedir="." --FILE-- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt trunk/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt
Hi! On 9/6/11 5:11 AM, Ulf Wendel wrote: FAIL LOAD DATA INFILE - open_basedir [ext/mysql/tests/mysql_query_load_data_openbasedir.phpt] Please check if the current fix works for you. -- Stanislav Malyshev, Software Architect SugarCRM: http://www.sugarcrm.com/ (408)454-6900 ext. 227 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/mysqli_libmysql.h branches/PHP_5_4/ext/mysqli/mysqli_libmysql.h branches/PHP_5_4/ext/mysqli/tests/bug55582.phpt trunk/ext/mysqli/mysqli_libmysq
andrey Tue, 06 Sep 2011 19:52:19 +
Revision: http://svn.php.net/viewvc?view=revision&revision=316289
Log:
Fix problems with the unbuffered set detection, for libmysql, which resulted
in always true. Thanks Stas.
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_libmysql.h
U php/php-src/branches/PHP_5_4/ext/mysqli/mysqli_libmysql.h
U php/php-src/branches/PHP_5_4/ext/mysqli/tests/bug55582.phpt
U php/php-src/trunk/ext/mysqli/mysqli_libmysql.h
U php/php-src/trunk/ext/mysqli/tests/bug55582.phpt
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_libmysql.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_libmysql.h 2011-09-06
19:51:35 UTC (rev 316288)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_libmysql.h 2011-09-06
19:52:19 UTC (rev 316289)
@@ -29,8 +29,8 @@
#define MYSQLND_OPT_NUMERIC_AND_DATETIME_AS_UNICODE200
#define MYSQLND_OPT_INT_AND_YEAR_AS_INT201
-#define mysqli_result_is_unbuffered(r) ((r)->handle &&
(r)->handle->status == MYSQL_STATUS_USE_RESULT)
-#define mysqli_result_is_unbuffered_and_not_everything_is_fetched(r)
(((r)->handle && (r)->handle->status == MYSQL_STATUS_USE_RESULT) || ((r)->data
== NULL))
+#define mysqli_result_is_unbuffered(r) ((r)->handle &&
(r)->handle->status == MYSQL_STATUS_USE_RESULT && (r)->data == NULL)
+#define mysqli_result_is_unbuffered_and_not_everything_is_fetched(r)
mysqli_result_is_unbuffered(r)
#define mysqli_server_status(c)
(c)->server_status
#define mysqli_stmt_get_id(s) ((s)->stmt_id)
#define mysqli_stmt_warning_count(s) mysql_warning_count((s)->mysql)
Modified: php/php-src/branches/PHP_5_4/ext/mysqli/mysqli_libmysql.h
===
--- php/php-src/branches/PHP_5_4/ext/mysqli/mysqli_libmysql.h 2011-09-06
19:51:35 UTC (rev 316288)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/mysqli_libmysql.h 2011-09-06
19:52:19 UTC (rev 316289)
@@ -29,8 +29,8 @@
#define MYSQLND_OPT_INT_AND_YEAR_AS_INT201
/* r->data should be always NULL, at least in recent libmysql versions, the
status changes once data is read*/
-#define mysqli_result_is_unbuffered(r) (((r)->handle &&
(r)->handle->status == MYSQL_STATUS_USE_RESULT) || ((r)->data == NULL))
-#define mysqli_result_is_unbuffered_and_not_everything_is_fetched(r)
(((r)->handle && (r)->handle->status == MYSQL_STATUS_USE_RESULT) || ((r)->data
== NULL))
+#define mysqli_result_is_unbuffered(r) ((r)->handle &&
(r)->handle->status == MYSQL_STATUS_USE_RESULT && (r)->data == NULL)
+#define mysqli_result_is_unbuffered_and_not_everything_is_fetched(r)
mysqli_result_is_unbuffered(r)
#define mysqli_server_status(c)
(c)->server_status
#define mysqli_stmt_get_id(s) ((s)->stmt_id)
#define mysqli_stmt_warning_count(s) mysql_warning_count((s)->mysql)
Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/bug55582.phpt
===
--- php/php-src/branches/PHP_5_4/ext/mysqli/tests/bug55582.phpt 2011-09-06
19:51:35 UTC (rev 316288)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/bug55582.phpt 2011-09-06
19:52:19 UTC (rev 316289)
@@ -5,7 +5,6 @@
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
require_once("connect.inc");
-if(!$IS_MYSQLND) die("skip This bug is for mysqlnd only");
?>
--FILE--
data should be always NULL, at least in recent libmysql versions, the
status changes once data is read*/
-#define mysqli_result_is_unbuffered(r) (((r)->handle &&
(r)->handle->status == MYSQL_STATUS_USE_RESULT) || ((r)->data == NULL))
-#define mysqli_result_is_unbuffered_and_not_everything_is_fetched(r)
(((r)->handle && (r)->handle->status == MYSQL_STATUS_USE_RESULT) || ((r)->data
== NULL))
+#define mysqli_result_is_unbuffered(r) ((r)->handle &&
(r)->handle->status == MYSQL_STATUS_USE_RESULT && (r)->data == NULL)
+#define mysqli_result_is_unbuffered_and_not_everything_is_fetched(r)
mysqli_result_is_unbuffered(r)
#define mysqli_server_status(c)
(c)->server_status
#define mysqli_stmt_get_id(s) ((s)->stmt_id)
#define mysqli_stmt_warning_count(s) mysql_warning_count((s)->mysql)
Modified: php/php-src/trunk/ext/mysqli/tests/bug55582.phpt
===
--- php/php-src/trunk/ext/mysqli/tests/bug55582.phpt2011-09-06 19:51:35 UTC
(rev 316288)
+++ php/php-src/trunk/ext/mysqli/tests/bug55582.phpt2011-09-06 19:52:19 UTC
(rev 316289)
@@ -5,7 +5,6 @@
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
require_
[PHP-CVS] svn: /php/php-src/branches/ PHP_5_3/ext/sockets/tests/socket_strerror.phpt PHP_5_4/ext/sockets/tests/socket_strerror.phpt
laruence Wed, 07 Sep 2011 00:56:52 +
Revision: http://svn.php.net/viewvc?view=revision&revision=316295
Log:
fixed typo
Changed paths:
U php/php-src/branches/PHP_5_3/ext/sockets/tests/socket_strerror.phpt
U php/php-src/branches/PHP_5_4/ext/sockets/tests/socket_strerror.phpt
Modified: php/php-src/branches/PHP_5_3/ext/sockets/tests/socket_strerror.phpt
===
--- php/php-src/branches/PHP_5_3/ext/sockets/tests/socket_strerror.phpt
2011-09-07 00:21:48 UTC (rev 316294)
+++ php/php-src/branches/PHP_5_3/ext/sockets/tests/socket_strerror.phpt
2011-09-07 00:56:52 UTC (rev 316295)
@@ -9,7 +9,7 @@
die('skip sockets extension not available.');
}
if (!stristr(PHP_OS, "Linux")) {
-die('skip - test validtes linux error strings only.');
+die('skip - test validates linux error strings only.');
}
?>
--FILE--
Modified: php/php-src/branches/PHP_5_4/ext/sockets/tests/socket_strerror.phpt
===
--- php/php-src/branches/PHP_5_4/ext/sockets/tests/socket_strerror.phpt
2011-09-07 00:21:48 UTC (rev 316294)
+++ php/php-src/branches/PHP_5_4/ext/sockets/tests/socket_strerror.phpt
2011-09-07 00:56:52 UTC (rev 316295)
@@ -9,7 +9,7 @@
die('skip sockets extension not available.');
}
if (!stristr(PHP_OS, "Linux")) {
-die('skip - test validtes linux error strings only.');
+die('skip - test validates linux error strings only.');
}
?>
--FILE--
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/spl/tests/DirectoryIterator_getExtension_basic.phpt branches/PHP_5_4/ext/spl/tests/DirectoryIterator_getExtension_basic.phpt trunk/ext/spl/tests/Direc
laruence Wed, 07 Sep 2011 00:59:10 + Revision: http://svn.php.net/viewvc?view=revision&revision=316296 Log: fix skipif description Changed paths: U php/php-src/branches/PHP_5_3/ext/spl/tests/DirectoryIterator_getExtension_basic.phpt U php/php-src/branches/PHP_5_4/ext/spl/tests/DirectoryIterator_getExtension_basic.phpt U php/php-src/trunk/ext/spl/tests/DirectoryIterator_getExtension_basic.phpt Modified: php/php-src/branches/PHP_5_3/ext/spl/tests/DirectoryIterator_getExtension_basic.phpt === --- php/php-src/branches/PHP_5_3/ext/spl/tests/DirectoryIterator_getExtension_basic.phpt 2011-09-07 00:56:52 UTC (rev 316295) +++ php/php-src/branches/PHP_5_3/ext/spl/tests/DirectoryIterator_getExtension_basic.phpt 2011-09-07 00:59:10 UTC (rev 316296) @@ -3,7 +3,7 @@ --SKIPIF-- --FILE-- Modified: php/php-src/branches/PHP_5_4/ext/spl/tests/DirectoryIterator_getExtension_basic.phpt === --- php/php-src/branches/PHP_5_4/ext/spl/tests/DirectoryIterator_getExtension_basic.phpt 2011-09-07 00:56:52 UTC (rev 316295) +++ php/php-src/branches/PHP_5_4/ext/spl/tests/DirectoryIterator_getExtension_basic.phpt 2011-09-07 00:59:10 UTC (rev 316296) @@ -3,7 +3,7 @@ --SKIPIF-- --FILE-- Modified: php/php-src/trunk/ext/spl/tests/DirectoryIterator_getExtension_basic.phpt === --- php/php-src/trunk/ext/spl/tests/DirectoryIterator_getExtension_basic.phpt 2011-09-07 00:56:52 UTC (rev 316295) +++ php/php-src/trunk/ext/spl/tests/DirectoryIterator_getExtension_basic.phpt 2011-09-07 00:59:10 UTC (rev 316296) @@ -3,7 +3,7 @@ --SKIPIF-- --FILE-- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/sapi/cli/php_cli_server.c trunk/sapi/cli/php_cli_server.c
laruence Wed, 07 Sep 2011 05:14:54 +
Revision: http://svn.php.net/viewvc?view=revision&revision=316298
Log:
Fixed Bug #55423(cli-server could not output correctly in some case)
Bug: https://bugs.php.net/55423 (Open) cli-server could not output correctly in
some case.
Changed paths:
U php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c
U php/php-src/trunk/sapi/cli/php_cli_server.c
Modified: php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c
===
--- php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c 2011-09-07
01:06:30 UTC (rev 316297)
+++ php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c 2011-09-07
05:14:54 UTC (rev 316298)
@@ -1542,7 +1542,7 @@
struct timeval tv = { 10, 0 };
ssize_t nbytes_left = str_len;
do {
- ssize_t nbytes_sent = send(client->sock, str, str_len, 0);
+ ssize_t nbytes_sent = send(client->sock, str + str_len -
nbytes_left, nbytes_left, 0);
if (nbytes_sent < 0) {
int err = php_socket_errno();
if (err == EAGAIN) {
Modified: php/php-src/trunk/sapi/cli/php_cli_server.c
===
--- php/php-src/trunk/sapi/cli/php_cli_server.c 2011-09-07 01:06:30 UTC (rev
316297)
+++ php/php-src/trunk/sapi/cli/php_cli_server.c 2011-09-07 05:14:54 UTC (rev
316298)
@@ -1542,7 +1542,7 @@
struct timeval tv = { 10, 0 };
ssize_t nbytes_left = str_len;
do {
- ssize_t nbytes_sent = send(client->sock, str, str_len, 0);
+ ssize_t nbytes_sent = send(client->sock, str + str_len -
nbytes_left, nbytes_left, 0);
if (nbytes_sent < 0) {
int err = php_socket_errno();
if (err == EAGAIN) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/NEWS trunk/NEWS
laruence Wed, 07 Sep 2011 05:19:12 + Revision: http://svn.php.net/viewvc?view=revision&revision=316299 Log: update news Changed paths: U php/php-src/branches/PHP_5_4/NEWS U php/php-src/trunk/NEWS Modified: php/php-src/branches/PHP_5_4/NEWS === --- php/php-src/branches/PHP_5_4/NEWS 2011-09-07 05:14:54 UTC (rev 316298) +++ php/php-src/branches/PHP_5_4/NEWS 2011-09-07 05:19:12 UTC (rev 316299) @@ -351,6 +351,7 @@ - Fixed bug #55471 (ZTS build broken with dtrace). (Laruence) - Fixed bug #55463 (cli-server missing _SERVER[REMOTE_ADDR]). (Laruence) - Fixed bug #55473 (mysql_pconnect leaks file descriptors on reconnect). (Andrey, Laruence) +- Fixed bug #55423 (cli-server could not output correctly in some case). (Laruence, chobieee at gmail dot com) 28 Jul 2011, PHP 5.3.7 RC4 - Improved core functions: Modified: php/php-src/trunk/NEWS === --- php/php-src/trunk/NEWS 2011-09-07 05:14:54 UTC (rev 316298) +++ php/php-src/trunk/NEWS 2011-09-07 05:19:12 UTC (rev 316299) @@ -250,5 +250,6 @@ - Fixed bug #55471 (ZTS build broken with dtrace). (Laruence) - Fixed bug #55463 (cli-server missing _SERVER[REMOTE_ADDR]). (Laruence) - Fixed bug #55473 (mysql_pconnect leaks file descriptors on reconnect). (Andrey, Laruence) +- Fixed bug #55423 (cli-server could not output correctly in some case). (Laruence, chobieee at gmail dot com) <<< NOTE: Insert NEWS from last stable release here prior to actual release! >>> -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
