cellog Sun, 26 Jul 2009 03:07:23 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=286345
Log: make cache_list tests pass in php 6 Changed paths: U pecl/phar/trunk/phar_object.c U pecl/phar/trunk/tests/cache_list/copyonwrite17.phar.phpt U pecl/phar/trunk/tests/cache_list/copyonwrite19.phar.phpt U pecl/phar/trunk/tests/cache_list/files/frontcontroller12.phar U pecl/phar/trunk/tests/cache_list/files/frontcontroller12.phar.inc U pecl/phar/trunk/tests/cache_list/files/frontcontroller14.phar U pecl/phar/trunk/tests/cache_list/files/frontcontroller14.phar.inc U pecl/phar/trunk/tests/cache_list/files/frontcontroller3.phar U pecl/phar/trunk/tests/cache_list/files/frontcontroller3.phar.inc U pecl/phar/trunk/tests/cache_list/files/frontcontroller4.phar U pecl/phar/trunk/tests/cache_list/files/frontcontroller4.phar.inc U pecl/phar/trunk/tests/cache_list/files/frontcontroller8.phar U pecl/phar/trunk/tests/cache_list/files/frontcontroller8.phar.inc U pecl/phar/trunk/tests/cache_list/files/write24.phar U pecl/phar/trunk/tests/cache_list/files/write24.phar.inc U pecl/phar/trunk/tests/cache_list/frontcontroller21.phpt U pecl/phar/trunk/tests/cache_list/frontcontroller22.phpt U php/php-src/branches/PHP_5_3/ext/phar/phar_object.c U php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/copyonwrite17.phar.phpt U php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/copyonwrite19.phar.phpt U php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/frontcontroller12.phar U php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/frontcontroller12.phar.inc U php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/frontcontroller14.phar U php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/frontcontroller14.phar.inc U php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/frontcontroller3.phar U php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/frontcontroller3.phar.inc U php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/frontcontroller4.phar U php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/frontcontroller4.phar.inc U php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/frontcontroller8.phar U php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/frontcontroller8.phar.inc U php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/write24.phar U php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/write24.phar.inc U php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/frontcontroller21.phpt U php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/frontcontroller22.phpt U php/php-src/trunk/ext/phar/phar_object.c U php/php-src/trunk/ext/phar/tests/cache_list/copyonwrite17.phar.phpt U php/php-src/trunk/ext/phar/tests/cache_list/copyonwrite19.phar.phpt U php/php-src/trunk/ext/phar/tests/cache_list/files/frontcontroller12.phar U php/php-src/trunk/ext/phar/tests/cache_list/files/frontcontroller12.phar.inc U php/php-src/trunk/ext/phar/tests/cache_list/files/frontcontroller14.phar U php/php-src/trunk/ext/phar/tests/cache_list/files/frontcontroller14.phar.inc U php/php-src/trunk/ext/phar/tests/cache_list/files/frontcontroller3.phar U php/php-src/trunk/ext/phar/tests/cache_list/files/frontcontroller3.phar.inc U php/php-src/trunk/ext/phar/tests/cache_list/files/frontcontroller4.phar U php/php-src/trunk/ext/phar/tests/cache_list/files/frontcontroller4.phar.inc U php/php-src/trunk/ext/phar/tests/cache_list/files/frontcontroller8.phar U php/php-src/trunk/ext/phar/tests/cache_list/files/frontcontroller8.phar.inc U php/php-src/trunk/ext/phar/tests/cache_list/files/write24.phar U php/php-src/trunk/ext/phar/tests/cache_list/files/write24.phar.inc U php/php-src/trunk/ext/phar/tests/cache_list/frontcontroller21.phpt U php/php-src/trunk/ext/phar/tests/cache_list/frontcontroller22.phpt
Modified: pecl/phar/trunk/phar_object.c =================================================================== --- pecl/phar/trunk/phar_object.c 2009-07-26 02:43:14 UTC (rev 286344) +++ pecl/phar/trunk/phar_object.c 2009-07-26 03:07:23 UTC (rev 286345) @@ -941,19 +941,7 @@ ++ext; #if PHP_MAJOR_VERSION >= 6 - if (FAILURE == zend_hash_find(Z_ARRVAL_P(mimeoverride), ext, strlen(ext)+1, (void **) &val)) { - /* try unicode extension */ - zstr zext; - zspprintf(IS_UNICODE, &zext, 0, "%s", ext); - if (SUCCESS == zend_u_hash_find(Z_ARRVAL_P(mimeoverride), IS_UNICODE, zext, strlen(ext)+1, (void **) &val)) { - ezfree(zext); - goto unicode_found; - } - ezfree(zext); - goto notfound; - } -unicode_found: - { /* this prevents parse error */ + if (phar_find_key(Z_ARRVAL_P(mimeoverride), ext, strlen(ext)+1, (void **) &val)) { #else if (SUCCESS == zend_hash_find(Z_ARRVAL_P(mimeoverride), ext, strlen(ext)+1, (void **) &val)) { #endif @@ -990,9 +978,6 @@ } } -#if PHP_MAJOR_VERSION >= 6 -notfound: -#endif if (!mime_type) { code = phar_file_type(&PHAR_G(mime_types), entry, &mime_type TSRMLS_CC); } Modified: pecl/phar/trunk/tests/cache_list/copyonwrite17.phar.phpt =================================================================== --- pecl/phar/trunk/tests/cache_list/copyonwrite17.phar.phpt 2009-07-26 02:43:14 UTC (rev 286344) +++ pecl/phar/trunk/tests/cache_list/copyonwrite17.phar.phpt 2009-07-26 03:07:23 UTC (rev 286345) @@ -10,5 +10,5 @@ files/write17.phar --EXPECTF-- NULL -string(2) "hi" +%string|unicode%(2) "hi" ok \ No newline at end of file Modified: pecl/phar/trunk/tests/cache_list/copyonwrite19.phar.phpt =================================================================== --- pecl/phar/trunk/tests/cache_list/copyonwrite19.phar.phpt 2009-07-26 02:43:14 UTC (rev 286344) +++ pecl/phar/trunk/tests/cache_list/copyonwrite19.phar.phpt 2009-07-26 03:07:23 UTC (rev 286345) @@ -10,5 +10,5 @@ files/write19.phar --EXPECTF-- string(2) "hi" -string(3) "hi2" +%string|unicode%(3) "hi2" ok \ No newline at end of file Modified: pecl/phar/trunk/tests/cache_list/files/frontcontroller12.phar =================================================================== (Binary files differ) Modified: pecl/phar/trunk/tests/cache_list/files/frontcontroller12.phar.inc =================================================================== --- pecl/phar/trunk/tests/cache_list/files/frontcontroller12.phar.inc 2009-07-26 02:43:14 UTC (rev 286344) +++ pecl/phar/trunk/tests/cache_list/files/frontcontroller12.phar.inc 2009-07-26 03:07:23 UTC (rev 286345) @@ -3,13 +3,13 @@ $a = new Phar(dirname(__FILE__) . '/frontcontroller12.phar'); $a['index.php'] = '<?php var_dump($_SERVER["PHP_SELF"]); -var_dump($_SERVER["SCRIPT_NAME"]); -var_dump($_SERVER["SCRIPT_FILENAME"]); -var_dump($_SERVER["REQUEST_URI"]); -var_dump($_SERVER["PHAR_PHP_SELF"]); -var_dump($_SERVER["PHAR_SCRIPT_NAME"]); -var_dump($_SERVER["PHAR_SCRIPT_FILENAME"]); -var_dump($_SERVER["PHAR_REQUEST_URI"]); +var_dump($_SERVER[b"SCRIPT_NAME"]); +var_dump($_SERVER[b"SCRIPT_FILENAME"]); +var_dump($_SERVER[b"REQUEST_URI"]); +var_dump($_SERVER[b"PHAR_PHP_SELF"]); +var_dump($_SERVER[b"PHAR_SCRIPT_NAME"]); +var_dump($_SERVER[b"PHAR_SCRIPT_FILENAME"]); +var_dump($_SERVER[b"PHAR_REQUEST_URI"]); '; $a->setStub('<?php Phar::mungServer(array("PHP_SELF", "SCRIPT_NAME", "SCRIPT_FILENAME", "REQUEST_URI")); Modified: pecl/phar/trunk/tests/cache_list/files/frontcontroller14.phar =================================================================== (Binary files differ) Modified: pecl/phar/trunk/tests/cache_list/files/frontcontroller14.phar.inc =================================================================== --- pecl/phar/trunk/tests/cache_list/files/frontcontroller14.phar.inc 2009-07-26 02:43:14 UTC (rev 286344) +++ pecl/phar/trunk/tests/cache_list/files/frontcontroller14.phar.inc 2009-07-26 03:07:23 UTC (rev 286345) @@ -2,8 +2,8 @@ @unlink(dirname(__FILE__) . '/frontcontroller14.phar'); $a = new Phar(dirname(__FILE__) . '/frontcontroller14.phar'); $a['html/index.php'] = '<?php -var_dump($_SERVER["PATH_INFO"]); -var_dump($_SERVER["PATH_TRANSLATED"]); +var_dump($_SERVER[b"PATH_INFO"]); +var_dump($_SERVER[b"PATH_TRANSLATED"]); '; $a->setStub('<?php function s($a) Modified: pecl/phar/trunk/tests/cache_list/files/frontcontroller3.phar =================================================================== (Binary files differ) Modified: pecl/phar/trunk/tests/cache_list/files/frontcontroller3.phar.inc =================================================================== --- pecl/phar/trunk/tests/cache_list/files/frontcontroller3.phar.inc 2009-07-26 02:43:14 UTC (rev 286344) +++ pecl/phar/trunk/tests/cache_list/files/frontcontroller3.phar.inc 2009-07-26 03:07:23 UTC (rev 286345) @@ -7,7 +7,7 @@ $a->setStub('<?php function s($a) { - static $b = array("/hi" => "a.phps"); + static $b = array(b"/hi" => "a.phps"); if (isset($b[$a])) return $b[$a]; return $a; } Modified: pecl/phar/trunk/tests/cache_list/files/frontcontroller4.phar =================================================================== (Binary files differ) Modified: pecl/phar/trunk/tests/cache_list/files/frontcontroller4.phar.inc =================================================================== --- pecl/phar/trunk/tests/cache_list/files/frontcontroller4.phar.inc 2009-07-26 02:43:14 UTC (rev 286344) +++ pecl/phar/trunk/tests/cache_list/files/frontcontroller4.phar.inc 2009-07-26 03:07:23 UTC (rev 286345) @@ -7,7 +7,7 @@ $a->setStub('<?php function s($a) { - static $b = array("/hi" => false); + static $b = array(b"/hi" => false); if (isset($b[$a])) return $b[$a]; return $a; } Modified: pecl/phar/trunk/tests/cache_list/files/frontcontroller8.phar =================================================================== (Binary files differ) Modified: pecl/phar/trunk/tests/cache_list/files/frontcontroller8.phar.inc =================================================================== --- pecl/phar/trunk/tests/cache_list/files/frontcontroller8.phar.inc 2009-07-26 02:43:14 UTC (rev 286344) +++ pecl/phar/trunk/tests/cache_list/files/frontcontroller8.phar.inc 2009-07-26 03:07:23 UTC (rev 286345) @@ -2,7 +2,7 @@ @unlink(dirname(__FILE__) . '/frontcontroller8.phar'); $a = new Phar(dirname(__FILE__) . '/frontcontroller8.phar'); $a['a.phps'] = 'hio1'; -$a['a1.phps'] = '<?php var_dump($_SERVER["REQUEST_URI"], $_SERVER["PATH_INFO"]);'; +$a['a1.phps'] = '<?php var_dump($_SERVER[b"REQUEST_URI"], $_SERVER[b"PATH_INFO"]);'; $a['a.jpg'] = 'hio2'; $a['a.php'] = '<?php function hio(){}'; $a['fronk.gronk'] = 'hio3'; Modified: pecl/phar/trunk/tests/cache_list/files/write24.phar =================================================================== (Binary files differ) Modified: pecl/phar/trunk/tests/cache_list/files/write24.phar.inc =================================================================== --- pecl/phar/trunk/tests/cache_list/files/write24.phar.inc 2009-07-26 02:43:14 UTC (rev 286344) +++ pecl/phar/trunk/tests/cache_list/files/write24.phar.inc 2009-07-26 03:07:23 UTC (rev 286345) @@ -8,7 +8,7 @@ $p = new Phar(__FILE__); var_dump(isset($p["newname"])); $fp = fopen("phar://" . __FILE__ . "/newname", "w"); -fwrite($fp, "hi"); +fwrite($fp, b"hi"); fclose($fp); var_dump(isset($p["newname"])); echo "ok\n"; Modified: pecl/phar/trunk/tests/cache_list/frontcontroller21.phpt =================================================================== --- pecl/phar/trunk/tests/cache_list/frontcontroller21.phpt 2009-07-26 02:43:14 UTC (rev 286344) +++ pecl/phar/trunk/tests/cache_list/frontcontroller21.phpt 2009-07-26 03:07:23 UTC (rev 286345) @@ -15,8 +15,8 @@ --EXPECTHEADERS-- Content-type: text/html; charset=UTF-8 --EXPECTF-- +%unicode|string%(10) "/index.php" string(10) "/index.php" -string(10) "/index.php" string(%d) "phar://%sfrontcontroller21.php/index.php" string(18) "/index.php?test=hi" string(32) "/frontcontroller21.php/index.php" Modified: pecl/phar/trunk/tests/cache_list/frontcontroller22.phpt =================================================================== --- pecl/phar/trunk/tests/cache_list/frontcontroller22.phpt 2009-07-26 02:43:14 UTC (rev 286344) +++ pecl/phar/trunk/tests/cache_list/frontcontroller22.phpt 2009-07-26 03:07:23 UTC (rev 286345) @@ -14,8 +14,8 @@ --EXPECTHEADERS-- Content-type: text/html; charset=UTF-8 --EXPECTF-- -string(4) "test" -string(12) "oof/test.php" +%string|unicode%(4) "test" +%string|unicode%(12) "oof/test.php" Warning: include(./hi.php): failed to open stream: No such file or directory in phar://%s/oof/test.php on line %d Modified: php/php-src/branches/PHP_5_3/ext/phar/phar_object.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/phar/phar_object.c 2009-07-26 02:43:14 UTC (rev 286344) +++ php/php-src/branches/PHP_5_3/ext/phar/phar_object.c 2009-07-26 03:07:23 UTC (rev 286345) @@ -941,19 +941,7 @@ ++ext; #if PHP_MAJOR_VERSION >= 6 - if (FAILURE == zend_hash_find(Z_ARRVAL_P(mimeoverride), ext, strlen(ext)+1, (void **) &val)) { - /* try unicode extension */ - zstr zext; - zspprintf(IS_UNICODE, &zext, 0, "%s", ext); - if (SUCCESS == zend_u_hash_find(Z_ARRVAL_P(mimeoverride), IS_UNICODE, zext, strlen(ext)+1, (void **) &val)) { - ezfree(zext); - goto unicode_found; - } - ezfree(zext); - goto notfound; - } -unicode_found: - { /* this prevents parse error */ + if (phar_find_key(Z_ARRVAL_P(mimeoverride), ext, strlen(ext)+1, (void **) &val)) { #else if (SUCCESS == zend_hash_find(Z_ARRVAL_P(mimeoverride), ext, strlen(ext)+1, (void **) &val)) { #endif @@ -990,9 +978,6 @@ } } -#if PHP_MAJOR_VERSION >= 6 -notfound: -#endif if (!mime_type) { code = phar_file_type(&PHAR_G(mime_types), entry, &mime_type TSRMLS_CC); } Modified: php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/copyonwrite17.phar.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/copyonwrite17.phar.phpt 2009-07-26 02:43:14 UTC (rev 286344) +++ php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/copyonwrite17.phar.phpt 2009-07-26 03:07:23 UTC (rev 286345) @@ -10,5 +10,5 @@ files/write17.phar --EXPECTF-- NULL -string(2) "hi" +%string|unicode%(2) "hi" ok \ No newline at end of file Modified: php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/copyonwrite19.phar.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/copyonwrite19.phar.phpt 2009-07-26 02:43:14 UTC (rev 286344) +++ php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/copyonwrite19.phar.phpt 2009-07-26 03:07:23 UTC (rev 286345) @@ -10,5 +10,5 @@ files/write19.phar --EXPECTF-- string(2) "hi" -string(3) "hi2" +%string|unicode%(3) "hi2" ok \ No newline at end of file Modified: php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/frontcontroller12.phar =================================================================== (Binary files differ) Modified: php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/frontcontroller12.phar.inc =================================================================== --- php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/frontcontroller12.phar.inc 2009-07-26 02:43:14 UTC (rev 286344) +++ php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/frontcontroller12.phar.inc 2009-07-26 03:07:23 UTC (rev 286345) @@ -3,13 +3,13 @@ $a = new Phar(dirname(__FILE__) . '/frontcontroller12.phar'); $a['index.php'] = '<?php var_dump($_SERVER["PHP_SELF"]); -var_dump($_SERVER["SCRIPT_NAME"]); -var_dump($_SERVER["SCRIPT_FILENAME"]); -var_dump($_SERVER["REQUEST_URI"]); -var_dump($_SERVER["PHAR_PHP_SELF"]); -var_dump($_SERVER["PHAR_SCRIPT_NAME"]); -var_dump($_SERVER["PHAR_SCRIPT_FILENAME"]); -var_dump($_SERVER["PHAR_REQUEST_URI"]); +var_dump($_SERVER[b"SCRIPT_NAME"]); +var_dump($_SERVER[b"SCRIPT_FILENAME"]); +var_dump($_SERVER[b"REQUEST_URI"]); +var_dump($_SERVER[b"PHAR_PHP_SELF"]); +var_dump($_SERVER[b"PHAR_SCRIPT_NAME"]); +var_dump($_SERVER[b"PHAR_SCRIPT_FILENAME"]); +var_dump($_SERVER[b"PHAR_REQUEST_URI"]); '; $a->setStub('<?php Phar::mungServer(array("PHP_SELF", "SCRIPT_NAME", "SCRIPT_FILENAME", "REQUEST_URI")); Modified: php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/frontcontroller14.phar =================================================================== (Binary files differ) Modified: php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/frontcontroller14.phar.inc =================================================================== --- php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/frontcontroller14.phar.inc 2009-07-26 02:43:14 UTC (rev 286344) +++ php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/frontcontroller14.phar.inc 2009-07-26 03:07:23 UTC (rev 286345) @@ -2,8 +2,8 @@ @unlink(dirname(__FILE__) . '/frontcontroller14.phar'); $a = new Phar(dirname(__FILE__) . '/frontcontroller14.phar'); $a['html/index.php'] = '<?php -var_dump($_SERVER["PATH_INFO"]); -var_dump($_SERVER["PATH_TRANSLATED"]); +var_dump($_SERVER[b"PATH_INFO"]); +var_dump($_SERVER[b"PATH_TRANSLATED"]); '; $a->setStub('<?php function s($a) Modified: php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/frontcontroller3.phar =================================================================== (Binary files differ) Modified: php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/frontcontroller3.phar.inc =================================================================== --- php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/frontcontroller3.phar.inc 2009-07-26 02:43:14 UTC (rev 286344) +++ php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/frontcontroller3.phar.inc 2009-07-26 03:07:23 UTC (rev 286345) @@ -7,7 +7,7 @@ $a->setStub('<?php function s($a) { - static $b = array("/hi" => "a.phps"); + static $b = array(b"/hi" => "a.phps"); if (isset($b[$a])) return $b[$a]; return $a; } Modified: php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/frontcontroller4.phar =================================================================== (Binary files differ) Modified: php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/frontcontroller4.phar.inc =================================================================== --- php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/frontcontroller4.phar.inc 2009-07-26 02:43:14 UTC (rev 286344) +++ php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/frontcontroller4.phar.inc 2009-07-26 03:07:23 UTC (rev 286345) @@ -7,7 +7,7 @@ $a->setStub('<?php function s($a) { - static $b = array("/hi" => false); + static $b = array(b"/hi" => false); if (isset($b[$a])) return $b[$a]; return $a; } Modified: php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/frontcontroller8.phar =================================================================== (Binary files differ) Modified: php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/frontcontroller8.phar.inc =================================================================== --- php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/frontcontroller8.phar.inc 2009-07-26 02:43:14 UTC (rev 286344) +++ php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/frontcontroller8.phar.inc 2009-07-26 03:07:23 UTC (rev 286345) @@ -2,7 +2,7 @@ @unlink(dirname(__FILE__) . '/frontcontroller8.phar'); $a = new Phar(dirname(__FILE__) . '/frontcontroller8.phar'); $a['a.phps'] = 'hio1'; -$a['a1.phps'] = '<?php var_dump($_SERVER["REQUEST_URI"], $_SERVER["PATH_INFO"]);'; +$a['a1.phps'] = '<?php var_dump($_SERVER[b"REQUEST_URI"], $_SERVER[b"PATH_INFO"]);'; $a['a.jpg'] = 'hio2'; $a['a.php'] = '<?php function hio(){}'; $a['fronk.gronk'] = 'hio3'; Modified: php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/write24.phar =================================================================== (Binary files differ) Modified: php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/write24.phar.inc =================================================================== --- php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/write24.phar.inc 2009-07-26 02:43:14 UTC (rev 286344) +++ php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/write24.phar.inc 2009-07-26 03:07:23 UTC (rev 286345) @@ -8,7 +8,7 @@ $p = new Phar(__FILE__); var_dump(isset($p["newname"])); $fp = fopen("phar://" . __FILE__ . "/newname", "w"); -fwrite($fp, "hi"); +fwrite($fp, b"hi"); fclose($fp); var_dump(isset($p["newname"])); echo "ok\n"; Modified: php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/frontcontroller21.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/frontcontroller21.phpt 2009-07-26 02:43:14 UTC (rev 286344) +++ php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/frontcontroller21.phpt 2009-07-26 03:07:23 UTC (rev 286345) @@ -15,8 +15,8 @@ --EXPECTHEADERS-- Content-type: text/html; charset=UTF-8 --EXPECTF-- +%unicode|string%(10) "/index.php" string(10) "/index.php" -string(10) "/index.php" string(%d) "phar://%sfrontcontroller21.php/index.php" string(18) "/index.php?test=hi" string(32) "/frontcontroller21.php/index.php" Modified: php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/frontcontroller22.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/frontcontroller22.phpt 2009-07-26 02:43:14 UTC (rev 286344) +++ php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/frontcontroller22.phpt 2009-07-26 03:07:23 UTC (rev 286345) @@ -14,8 +14,8 @@ --EXPECTHEADERS-- Content-type: text/html; charset=UTF-8 --EXPECTF-- -string(4) "test" -string(12) "oof/test.php" +%string|unicode%(4) "test" +%string|unicode%(12) "oof/test.php" Warning: include(./hi.php): failed to open stream: No such file or directory in phar://%s/oof/test.php on line %d Modified: php/php-src/trunk/ext/phar/phar_object.c =================================================================== --- php/php-src/trunk/ext/phar/phar_object.c 2009-07-26 02:43:14 UTC (rev 286344) +++ php/php-src/trunk/ext/phar/phar_object.c 2009-07-26 03:07:23 UTC (rev 286345) @@ -941,19 +941,7 @@ ++ext; #if PHP_MAJOR_VERSION >= 6 - if (FAILURE == zend_hash_find(Z_ARRVAL_P(mimeoverride), ext, strlen(ext)+1, (void **) &val)) { - /* try unicode extension */ - zstr zext; - zspprintf(IS_UNICODE, &zext, 0, "%s", ext); - if (SUCCESS == zend_u_hash_find(Z_ARRVAL_P(mimeoverride), IS_UNICODE, zext, strlen(ext)+1, (void **) &val)) { - ezfree(zext); - goto unicode_found; - } - ezfree(zext); - goto notfound; - } -unicode_found: - { /* this prevents parse error */ + if (phar_find_key(Z_ARRVAL_P(mimeoverride), ext, strlen(ext)+1, (void **) &val)) { #else if (SUCCESS == zend_hash_find(Z_ARRVAL_P(mimeoverride), ext, strlen(ext)+1, (void **) &val)) { #endif @@ -990,9 +978,6 @@ } } -#if PHP_MAJOR_VERSION >= 6 -notfound: -#endif if (!mime_type) { code = phar_file_type(&PHAR_G(mime_types), entry, &mime_type TSRMLS_CC); } Modified: php/php-src/trunk/ext/phar/tests/cache_list/copyonwrite17.phar.phpt =================================================================== --- php/php-src/trunk/ext/phar/tests/cache_list/copyonwrite17.phar.phpt 2009-07-26 02:43:14 UTC (rev 286344) +++ php/php-src/trunk/ext/phar/tests/cache_list/copyonwrite17.phar.phpt 2009-07-26 03:07:23 UTC (rev 286345) @@ -10,5 +10,5 @@ files/write17.phar --EXPECTF-- NULL -string(2) "hi" +%string|unicode%(2) "hi" ok \ No newline at end of file Modified: php/php-src/trunk/ext/phar/tests/cache_list/copyonwrite19.phar.phpt =================================================================== --- php/php-src/trunk/ext/phar/tests/cache_list/copyonwrite19.phar.phpt 2009-07-26 02:43:14 UTC (rev 286344) +++ php/php-src/trunk/ext/phar/tests/cache_list/copyonwrite19.phar.phpt 2009-07-26 03:07:23 UTC (rev 286345) @@ -10,5 +10,5 @@ files/write19.phar --EXPECTF-- string(2) "hi" -string(3) "hi2" +%string|unicode%(3) "hi2" ok \ No newline at end of file Modified: php/php-src/trunk/ext/phar/tests/cache_list/files/frontcontroller12.phar =================================================================== (Binary files differ) Modified: php/php-src/trunk/ext/phar/tests/cache_list/files/frontcontroller12.phar.inc =================================================================== --- php/php-src/trunk/ext/phar/tests/cache_list/files/frontcontroller12.phar.inc 2009-07-26 02:43:14 UTC (rev 286344) +++ php/php-src/trunk/ext/phar/tests/cache_list/files/frontcontroller12.phar.inc 2009-07-26 03:07:23 UTC (rev 286345) @@ -3,13 +3,13 @@ $a = new Phar(dirname(__FILE__) . '/frontcontroller12.phar'); $a['index.php'] = '<?php var_dump($_SERVER["PHP_SELF"]); -var_dump($_SERVER["SCRIPT_NAME"]); -var_dump($_SERVER["SCRIPT_FILENAME"]); -var_dump($_SERVER["REQUEST_URI"]); -var_dump($_SERVER["PHAR_PHP_SELF"]); -var_dump($_SERVER["PHAR_SCRIPT_NAME"]); -var_dump($_SERVER["PHAR_SCRIPT_FILENAME"]); -var_dump($_SERVER["PHAR_REQUEST_URI"]); +var_dump($_SERVER[b"SCRIPT_NAME"]); +var_dump($_SERVER[b"SCRIPT_FILENAME"]); +var_dump($_SERVER[b"REQUEST_URI"]); +var_dump($_SERVER[b"PHAR_PHP_SELF"]); +var_dump($_SERVER[b"PHAR_SCRIPT_NAME"]); +var_dump($_SERVER[b"PHAR_SCRIPT_FILENAME"]); +var_dump($_SERVER[b"PHAR_REQUEST_URI"]); '; $a->setStub('<?php Phar::mungServer(array("PHP_SELF", "SCRIPT_NAME", "SCRIPT_FILENAME", "REQUEST_URI")); Modified: php/php-src/trunk/ext/phar/tests/cache_list/files/frontcontroller14.phar =================================================================== (Binary files differ) Modified: php/php-src/trunk/ext/phar/tests/cache_list/files/frontcontroller14.phar.inc =================================================================== --- php/php-src/trunk/ext/phar/tests/cache_list/files/frontcontroller14.phar.inc 2009-07-26 02:43:14 UTC (rev 286344) +++ php/php-src/trunk/ext/phar/tests/cache_list/files/frontcontroller14.phar.inc 2009-07-26 03:07:23 UTC (rev 286345) @@ -2,8 +2,8 @@ @unlink(dirname(__FILE__) . '/frontcontroller14.phar'); $a = new Phar(dirname(__FILE__) . '/frontcontroller14.phar'); $a['html/index.php'] = '<?php -var_dump($_SERVER["PATH_INFO"]); -var_dump($_SERVER["PATH_TRANSLATED"]); +var_dump($_SERVER[b"PATH_INFO"]); +var_dump($_SERVER[b"PATH_TRANSLATED"]); '; $a->setStub('<?php function s($a) Modified: php/php-src/trunk/ext/phar/tests/cache_list/files/frontcontroller3.phar =================================================================== (Binary files differ) Modified: php/php-src/trunk/ext/phar/tests/cache_list/files/frontcontroller3.phar.inc =================================================================== --- php/php-src/trunk/ext/phar/tests/cache_list/files/frontcontroller3.phar.inc 2009-07-26 02:43:14 UTC (rev 286344) +++ php/php-src/trunk/ext/phar/tests/cache_list/files/frontcontroller3.phar.inc 2009-07-26 03:07:23 UTC (rev 286345) @@ -7,7 +7,7 @@ $a->setStub('<?php function s($a) { - static $b = array("/hi" => "a.phps"); + static $b = array(b"/hi" => "a.phps"); if (isset($b[$a])) return $b[$a]; return $a; } Modified: php/php-src/trunk/ext/phar/tests/cache_list/files/frontcontroller4.phar =================================================================== (Binary files differ) Modified: php/php-src/trunk/ext/phar/tests/cache_list/files/frontcontroller4.phar.inc =================================================================== --- php/php-src/trunk/ext/phar/tests/cache_list/files/frontcontroller4.phar.inc 2009-07-26 02:43:14 UTC (rev 286344) +++ php/php-src/trunk/ext/phar/tests/cache_list/files/frontcontroller4.phar.inc 2009-07-26 03:07:23 UTC (rev 286345) @@ -7,7 +7,7 @@ $a->setStub('<?php function s($a) { - static $b = array("/hi" => false); + static $b = array(b"/hi" => false); if (isset($b[$a])) return $b[$a]; return $a; } Modified: php/php-src/trunk/ext/phar/tests/cache_list/files/frontcontroller8.phar =================================================================== (Binary files differ) Modified: php/php-src/trunk/ext/phar/tests/cache_list/files/frontcontroller8.phar.inc =================================================================== --- php/php-src/trunk/ext/phar/tests/cache_list/files/frontcontroller8.phar.inc 2009-07-26 02:43:14 UTC (rev 286344) +++ php/php-src/trunk/ext/phar/tests/cache_list/files/frontcontroller8.phar.inc 2009-07-26 03:07:23 UTC (rev 286345) @@ -2,7 +2,7 @@ @unlink(dirname(__FILE__) . '/frontcontroller8.phar'); $a = new Phar(dirname(__FILE__) . '/frontcontroller8.phar'); $a['a.phps'] = 'hio1'; -$a['a1.phps'] = '<?php var_dump($_SERVER["REQUEST_URI"], $_SERVER["PATH_INFO"]);'; +$a['a1.phps'] = '<?php var_dump($_SERVER[b"REQUEST_URI"], $_SERVER[b"PATH_INFO"]);'; $a['a.jpg'] = 'hio2'; $a['a.php'] = '<?php function hio(){}'; $a['fronk.gronk'] = 'hio3'; Modified: php/php-src/trunk/ext/phar/tests/cache_list/files/write24.phar =================================================================== (Binary files differ) Modified: php/php-src/trunk/ext/phar/tests/cache_list/files/write24.phar.inc =================================================================== --- php/php-src/trunk/ext/phar/tests/cache_list/files/write24.phar.inc 2009-07-26 02:43:14 UTC (rev 286344) +++ php/php-src/trunk/ext/phar/tests/cache_list/files/write24.phar.inc 2009-07-26 03:07:23 UTC (rev 286345) @@ -8,7 +8,7 @@ $p = new Phar(__FILE__); var_dump(isset($p["newname"])); $fp = fopen("phar://" . __FILE__ . "/newname", "w"); -fwrite($fp, "hi"); +fwrite($fp, b"hi"); fclose($fp); var_dump(isset($p["newname"])); echo "ok\n"; Modified: php/php-src/trunk/ext/phar/tests/cache_list/frontcontroller21.phpt =================================================================== --- php/php-src/trunk/ext/phar/tests/cache_list/frontcontroller21.phpt 2009-07-26 02:43:14 UTC (rev 286344) +++ php/php-src/trunk/ext/phar/tests/cache_list/frontcontroller21.phpt 2009-07-26 03:07:23 UTC (rev 286345) @@ -15,8 +15,8 @@ --EXPECTHEADERS-- Content-type: text/html; charset=UTF-8 --EXPECTF-- +%unicode|string%(10) "/index.php" string(10) "/index.php" -string(10) "/index.php" string(%d) "phar://%sfrontcontroller21.php/index.php" string(18) "/index.php?test=hi" string(32) "/frontcontroller21.php/index.php" Modified: php/php-src/trunk/ext/phar/tests/cache_list/frontcontroller22.phpt =================================================================== --- php/php-src/trunk/ext/phar/tests/cache_list/frontcontroller22.phpt 2009-07-26 02:43:14 UTC (rev 286344) +++ php/php-src/trunk/ext/phar/tests/cache_list/frontcontroller22.phpt 2009-07-26 03:07:23 UTC (rev 286345) @@ -14,8 +14,8 @@ --EXPECTHEADERS-- Content-type: text/html; charset=UTF-8 --EXPECTF-- -string(4) "test" -string(12) "oof/test.php" +%string|unicode%(4) "test" +%string|unicode%(12) "oof/test.php" Warning: include(./hi.php): failed to open stream: No such file or directory in phar://%s/oof/test.php on line %d
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php