From: Andrei Zmievski <andrei@php.net>
Date: Mon, 19 May 2008 19:39:25 +0000 (+0000)
Subject: Crossing the Rubicon: remove the unicode.semantics switch and default
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~1721
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0d018ee265fac203a853342ee0891fa48a49d8e2;p=php

Crossing the Rubicon: remove the unicode.semantics switch and default
unicode mode to On.
---

diff --git a/Zend/zend.c b/Zend/zend.c
index 7910265d13..54c889ba2e 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -192,7 +192,6 @@ ZEND_INI_BEGIN()
 	STD_ZEND_INI_BOOLEAN("zend.enable_gc",				"1",	ZEND_INI_ALL,		OnUpdateGCEnabled,      gc_enabled,     zend_gc_globals,        gc_globals)
 
 	/* Unicode .ini entries */
-	STD_ZEND_INI_BOOLEAN("unicode.semantics",			"0",	ZEND_INI_SYSTEM, OnUpdateBool, unicode, zend_unicode_globals, unicode_globals)
 	STD_ZEND_INI_ENTRY("unicode.fallback_encoding",		NULL,	ZEND_INI_ALL, OnUpdateEncoding, fallback_encoding_conv, zend_unicode_globals, unicode_globals)
 	STD_ZEND_INI_ENTRY("unicode.runtime_encoding",		NULL,	ZEND_INI_ALL, OnUpdateEncoding, runtime_encoding_conv, zend_unicode_globals, unicode_globals)
 	STD_ZEND_INI_ENTRY("unicode.script_encoding",		NULL,	ZEND_INI_ALL, OnUpdateEncoding, script_encoding_conv, zend_unicode_globals, unicode_globals)
@@ -965,7 +964,7 @@ static void php_scanner_globals_ctor(zend_php_scanner_globals *scanner_globals_p
 
 static void unicode_globals_ctor(zend_unicode_globals *unicode_globals TSRMLS_DC) /* {{{ */
 {
-	unicode_globals->unicode = 0;
+	unicode_globals->unicode = 1;
 	unicode_globals->utf8_conv = NULL;
 	unicode_globals->ascii_conv = NULL;
 	unicode_globals->fallback_encoding_conv = NULL;