* Refactor zend_multibyte facility.

  Now mbstring.script_encoding is superseded by zend.script_encoding.

Author: Moriyoshi Koizumi

Zend/zend.c

@@ -89,11 +89,25 @@ static ZEND_INI_MH(OnUpdateGCEnabled) /* {{{ */
 }
 /* }}} */
 
+static ZEND_INI_MH(OnUpdateScriptEncoding) /* {{{ */
+{
+	if (!CG(multibyte)) {
+		return FAILURE;
+	}
+	if (!zend_multibyte_get_functions(TSRMLS_C)) {
+		return SUCCESS;
+	}
+	return zend_multibyte_set_script_encoding_by_string(new_value, new_value_length TSRMLS_CC);
+}
+/* }}} */
+
+
 ZEND_INI_BEGIN()
 	ZEND_INI_ENTRY("error_reporting",				NULL,		ZEND_INI_ALL,		OnUpdateErrorReporting)
 	STD_ZEND_INI_BOOLEAN("zend.enable_gc",				"1",	ZEND_INI_ALL,		OnUpdateGCEnabled,      gc_enabled,     zend_gc_globals,        gc_globals)
  	STD_ZEND_INI_BOOLEAN("zend.multibyte", "0", ZEND_INI_PERDIR, OnUpdateBool, multibyte,      zend_compiler_globals, compiler_globals)
- 	STD_ZEND_INI_BOOLEAN("detect_unicode", "1", ZEND_INI_ALL, OnUpdateBool, detect_unicode, zend_compiler_globals, compiler_globals)
+ 	ZEND_INI_ENTRY("zend.script_encoding",			NULL,		ZEND_INI_ALL,		OnUpdateScriptEncoding)
+ 	STD_ZEND_INI_BOOLEAN("zend.detect_unicode",			"1",	ZEND_INI_ALL,		OnUpdateBool, detect_unicode, zend_compiler_globals, compiler_globals)
 ZEND_INI_END()
 
 
@@ -528,6 +542,9 @@ static void compiler_globals_dtor(zend_compiler_globals *compiler_globals TSRMLS
 	if (compiler_globals->static_members_table) {
 		free(compiler_globals->static_members_table);
 	}
+	if (compiler_globals->script_encoding_list) {
+		pefree(compiler_globals->script_encoding_list, 1);
+	}
 	compiler_globals->last_static_member = 0;
 }
 /* }}} */

Zend/zend_compile.c

@@ -197,9 +197,6 @@ void zend_init_compiler_data_structures(TSRMLS_D) /* {{{ */
 	init_compiler_declarables(TSRMLS_C);
 	zend_stack_init(&CG(context_stack));
 
-	CG(script_encoding_list) = NULL;
-	CG(script_encoding_list_size) = 0;
-	CG(internal_encoding) = NULL;
 	CG(encoding_declared) = 0;
 }
 /* }}} */
@@ -238,10 +235,6 @@ void shutdown_compiler(TSRMLS_D) /* {{{ */
 	zend_hash_destroy(&CG(filenames_table));
 	zend_llist_destroy(&CG(open_files));
 	zend_stack_destroy(&CG(context_stack));
-
-	if (CG(script_encoding_list)) {
-		efree(CG(script_encoding_list));
-	}
 }
 /* }}} */
 
@@ -5864,7 +5857,7 @@ void zend_do_declare_stmt(znode *var, znode *val TSRMLS_DC) /* {{{ */
 			CG(encoding_declared) = 1;
 
 			convert_to_string(&val->u.constant);
-			new_encoding = zend_multibyte_fetch_encoding(val->u.constant.value.str.val);
+			new_encoding = zend_multibyte_fetch_encoding(val->u.constant.value.str.val TSRMLS_CC);
 			if (!new_encoding) {
 				zend_error(E_COMPILE_WARNING, "Unsupported encoding [%s]", val->u.constant.value.str.val);
 			} else {
@@ -5879,6 +5872,8 @@ void zend_do_declare_stmt(znode *var, znode *val TSRMLS_DC) /* {{{ */
 					zend_multibyte_yyinput_again(old_input_filter, old_encoding TSRMLS_CC);
 				}
 			}
+		} else {
+			zend_error(E_COMPILE_WARNING, "declare(encoding=...) ignored because Zend multibyte feature is turned off by settings");
 		}
 		zval_dtor(&val->u.constant);
 	} else {

Zend/zend_globals.h

@@ -147,14 +147,12 @@ struct _zend_compiler_globals {
 
 	HashTable interned_strings;
 
-	zend_encoding **script_encoding_list;
+	const zend_encoding **script_encoding_list;
 	size_t script_encoding_list_size;
 	zend_bool multibyte;
 	zend_bool detect_unicode;
 	zend_bool encoding_declared;
 
-	zend_encoding *internal_encoding;
-
 #ifdef ZTS
 	zval ***static_members_table;
 	int last_static_member;
@@ -310,8 +308,7 @@ struct _zend_php_scanner_globals {
 	/* input/ouput filters */
 	zend_encoding_filter input_filter;
 	zend_encoding_filter output_filter;
-	zend_encoding *script_encoding;
-	zend_encoding *internal_encoding;
+	const zend_encoding *script_encoding;
 };
 
 #endif /* ZEND_GLOBALS_H */