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

4 files changed, 10 insertions, 9 deletions

diff --git a/ext/zlib/tests/005.phpt b/ext/zlib/tests/005.phpt
index 5c880f5fe3..d7b661d170 100644
--- a/ext/zlib/tests/005.phpt
+++ b/ext/zlib/tests/005.phpt
@@ -28,7 +28,7 @@ var_dump(gzuncompress(b"", 9));
 
 var_dump(gzuncompress($data1));
 var_dump(gzuncompress($data2));
-$data2{4} = 0;
+$data2[4] = 0;
 var_dump(gzuncompress((binary)$data2));
 
 echo "Done\n";
diff --git a/ext/zlib/tests/006.phpt b/ext/zlib/tests/006.phpt
index c51c8323aa..95b989b307 100644
--- a/ext/zlib/tests/006.phpt
+++ b/ext/zlib/tests/006.phpt
@@ -29,7 +29,7 @@ var_dump(gzinflate(b"asdf", 9));
 
 var_dump(gzinflate($data1));
 var_dump(gzinflate($data2));
-$data2{4} = 0;
+$data2[4] = 0;
 var_dump(gzinflate((binary)$data2));
 
 echo "Done\n";
diff --git a/ext/zlib/tests/zlib_filter_inflate2.phpt b/ext/zlib/tests/zlib_filter_inflate2.phpt
index 4332d8e5e6..a2099b6f7a 100644
--- a/ext/zlib/tests/zlib_filter_inflate2.phpt
+++ b/ext/zlib/tests/zlib_filter_inflate2.phpt
@@ -6,7 +6,7 @@ zlib.inflate of gzip-encoded stream
 <?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 @@ fclose($fp);
 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
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index a959ba0f69..43da12d6c3 100644
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -326,6 +326,7 @@ static void sapi_cli_register_variables(zval *track_vars_array TSRMLS_DC) /* {{{
 {
 	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 @@ static void sapi_cli_register_variables(zval *track_vars_array TSRMLS_DC) /* {{{
 	/* 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);
 	}
 }
 /* }}} */