rasmus Sun, 26 Jul 2009 16:50:41 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=286363
Log: Still lots more Unicode work to be done here, but this is a start Changed paths: U php/php-src/trunk/ext/zlib/tests/005.phpt U php/php-src/trunk/ext/zlib/tests/006.phpt U php/php-src/trunk/ext/zlib/tests/zlib_filter_inflate2.phpt U php/php-src/trunk/sapi/cli/php_cli.c Modified: php/php-src/trunk/ext/zlib/tests/005.phpt =================================================================== --- php/php-src/trunk/ext/zlib/tests/005.phpt 2009-07-26 15:53:36 UTC (rev 286362) +++ php/php-src/trunk/ext/zlib/tests/005.phpt 2009-07-26 16:50:41 UTC (rev 286363) @@ -28,7 +28,7 @@ var_dump(gzuncompress($data1)); var_dump(gzuncompress($data2)); -$data2{4} = 0; +$data2[4] = 0; var_dump(gzuncompress((binary)$data2)); echo "Done\n"; Modified: php/php-src/trunk/ext/zlib/tests/006.phpt =================================================================== --- php/php-src/trunk/ext/zlib/tests/006.phpt 2009-07-26 15:53:36 UTC (rev 286362) +++ php/php-src/trunk/ext/zlib/tests/006.phpt 2009-07-26 16:50:41 UTC (rev 286363) @@ -29,7 +29,7 @@ var_dump(gzinflate($data1)); var_dump(gzinflate($data2)); -$data2{4} = 0; +$data2[4] = 0; var_dump(gzinflate((binary)$data2)); echo "Done\n"; Modified: php/php-src/trunk/ext/zlib/tests/zlib_filter_inflate2.phpt =================================================================== --- php/php-src/trunk/ext/zlib/tests/zlib_filter_inflate2.phpt 2009-07-26 15:53:36 UTC (rev 286362) +++ php/php-src/trunk/ext/zlib/tests/zlib_filter_inflate2.phpt 2009-07-26 16:50:41 UTC (rev 286363) @@ -6,7 +6,7 @@ <?php /* $Id$ */ $a = gzopen(dirname(__FILE__) . '/test.txt.gz', 'w'); -fwrite($a, "This is quite the thing ain't it\n"); +fwrite($a, b"This is quite the thing ain't it\n"); fclose($a); $fp = fopen(dirname(__FILE__) . '/test.txt.gz', 'r'); @@ -38,4 +38,4 @@ 2 This is quite the thing ain't it 3 -This is quite the thing ain't it \ No newline at end of file +This is quite the thing ain't it Modified: php/php-src/trunk/sapi/cli/php_cli.c =================================================================== --- php/php-src/trunk/sapi/cli/php_cli.c 2009-07-26 15:53:36 UTC (rev 286362) +++ php/php-src/trunk/sapi/cli/php_cli.c 2009-07-26 16:50:41 UTC (rev 286363) @@ -326,6 +326,7 @@ { unsigned int len; char *docroot = ""; + UConverter *conv = ZEND_U_CONVERTER(UG(runtime_encoding_conv)); /* In CGI mode, we consider the environment to be a part of the server * variables @@ -335,23 +336,23 @@ /* Build the special-case PHP_SELF variable for the CLI version */ len = strlen(php_self); if (sapi_module.input_filter(PARSE_SERVER, "PHP_SELF", &php_self, len, &len TSRMLS_CC)) { - php_register_variable("PHP_SELF", php_self, track_vars_array TSRMLS_CC); + php_register_variable_with_conv(conv, ZEND_STRL("PHP_SELF"), php_self, len, track_vars_array, 0 TSRMLS_CC); } if (sapi_module.input_filter(PARSE_SERVER, "SCRIPT_NAME", &php_self, len, &len TSRMLS_CC)) { - php_register_variable("SCRIPT_NAME", php_self, track_vars_array TSRMLS_CC); + php_register_variable_with_conv(conv, ZEND_STRL("SCRIPT_NAME"), php_self, len, track_vars_array, 0 TSRMLS_CC); } /* filenames are empty for stdin */ len = strlen(script_filename); if (sapi_module.input_filter(PARSE_SERVER, "SCRIPT_FILENAME", &script_filename, len, &len TSRMLS_CC)) { - php_register_variable("SCRIPT_FILENAME", script_filename, track_vars_array TSRMLS_CC); + php_register_variable_with_conv(conv, ZEND_STRL("SCRIPT_FILENAME"), script_filename, len, track_vars_array, 0 TSRMLS_CC); } if (sapi_module.input_filter(PARSE_SERVER, "PATH_TRANSLATED", &script_filename, len, &len TSRMLS_CC)) { - php_register_variable("PATH_TRANSLATED", script_filename, track_vars_array TSRMLS_CC); + php_register_variable_with_conv(conv, ZEND_STRL("PATH_TRANSLATED"), script_filename, len, track_vars_array, 0 TSRMLS_CC); } /* just make it available */ len = 0U; if (sapi_module.input_filter(PARSE_SERVER, "DOCUMENT_ROOT", &docroot, len, &len TSRMLS_CC)) { - php_register_variable("DOCUMENT_ROOT", docroot, track_vars_array TSRMLS_CC); + php_register_variable_with_conv(conv, ZEND_STRL("DOCUMENT_ROOT"), docroot, len, track_vars_array, 0 TSRMLS_CC); } } /* }}} */
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php