archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 23:18:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Still lots more Unicode work to be done here, but this is a start

Browse source
This commit is contained in:
Rasmus Lerdorf 2009-07-26 16:50:41 +00:00
parent 415795f827
commit 5f64810ebd
4 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/zlib/tests/005.phpt
View file

@ -28,7 +28,7 @@ var_dump(gzuncompress(b"", 9));
var_dump(gzuncompress($data1)); var_dump(gzuncompress($data1));
var_dump(gzuncompress($data2)); var_dump(gzuncompress($data2));
$data2{4} = 0; $data2[4] = 0;
var_dump(gzuncompress((binary)$data2)); var_dump(gzuncompress((binary)$data2));
echo "Done\n"; echo "Done\n";

2
ext/zlib/tests/006.phpt
View file

@ -29,7 +29,7 @@ var_dump(gzinflate(b"asdf", 9));
var_dump(gzinflate($data1)); var_dump(gzinflate($data1));
var_dump(gzinflate($data2)); var_dump(gzinflate($data2));
$data2{4} = 0; $data2[4] = 0;
var_dump(gzinflate((binary)$data2)); var_dump(gzinflate((binary)$data2));
echo "Done\n"; echo "Done\n";

4
ext/zlib/tests/zlib_filter_inflate2.phpt
View file

@ -6,7 +6,7 @@ zlib.inflate of gzip-encoded stream
<?php /* $Id$ */ <?php /* $Id$ */
$a = gzopen(dirname(__FILE__) . '/test.txt.gz', 'w'); $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); fclose($a);
$fp = fopen(dirname(__FILE__) . '/test.txt.gz', 'r'); $fp = fopen(dirname(__FILE__) . '/test.txt.gz', 'r');
@ -38,4 +38,4 @@ fclose($fp);
2 2
This is quite the thing ain't it This is quite the thing ain't it
3 3
This is quite the thing ain't it This is quite the thing ain't it

11
sapi/cli/php_cli.c
View file

@ -326,6 +326,7 @@ static void sapi_cli_register_variables(zval *track_vars_array TSRMLS_DC) /* {{{
{ {
unsigned int len; unsigned int len;
char *docroot = ""; 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 /* In CGI mode, we consider the environment to be a part of the server
* variables * variables
@ -335,23 +336,23 @@ static void sapi_cli_register_variables(zval *track_vars_array TSRMLS_DC) /* {{{
/* Build the special-case PHP_SELF variable for the CLI version */ /* Build the special-case PHP_SELF variable for the CLI version */
len = strlen(php_self); len = strlen(php_self);
if (sapi_module.input_filter(PARSE_SERVER, "PHP_SELF", &php_self, len, &len TSRMLS_CC)) { 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)) { 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 */ /* filenames are empty for stdin */
len = strlen(script_filename); len = strlen(script_filename);
if (sapi_module.input_filter(PARSE_SERVER, "SCRIPT_FILENAME", &script_filename, len, &len TSRMLS_CC)) { 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)) { 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 */ /* just make it available */
len = 0U; len = 0U;
if (sapi_module.input_filter(PARSE_SERVER, "DOCUMENT_ROOT", &docroot, len, &len TSRMLS_CC)) { 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);
} }
} }
/* }}} */ /* }}} */