Merge mainstream 'master' branch into refactoring

During merge I had to revert:
	Nikita's patch for php_splice() (it probably needs to be applyed again)
	Bob Weinand's patches related to constant expression handling (we need to review them carefully)
	I also reverted all our attempts to support sapi/phpdbg (we didn't test it anyway)

Conflicts:
	Zend/zend.h
	Zend/zend_API.c
	Zend/zend_ast.c
	Zend/zend_compile.c
	Zend/zend_compile.h
	Zend/zend_constants.c
	Zend/zend_exceptions.c
	Zend/zend_execute.c
	Zend/zend_execute.h
	Zend/zend_execute_API.c
	Zend/zend_hash.c
	Zend/zend_highlight.c
	Zend/zend_language_parser.y
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner_defs.h
	Zend/zend_variables.c
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
	ext/date/php_date.c
	ext/dom/documenttype.c
	ext/hash/hash.c
	ext/iconv/iconv.c
	ext/mbstring/tests/zend_multibyte-10.phpt
	ext/mbstring/tests/zend_multibyte-11.phpt
	ext/mbstring/tests/zend_multibyte-12.phpt
	ext/mysql/php_mysql.c
	ext/mysqli/mysqli.c
	ext/mysqlnd/mysqlnd_reverse_api.c
	ext/mysqlnd/php_mysqlnd.c
	ext/opcache/ZendAccelerator.c
	ext/opcache/zend_accelerator_util_funcs.c
	ext/opcache/zend_persist.c
	ext/opcache/zend_persist_calc.c
	ext/pcre/php_pcre.c
	ext/pdo/pdo_dbh.c
	ext/pdo/pdo_stmt.c
	ext/pdo_pgsql/pgsql_driver.c
	ext/pgsql/pgsql.c
	ext/reflection/php_reflection.c
	ext/session/session.c
	ext/spl/spl_array.c
	ext/spl/spl_observer.c
	ext/standard/array.c
	ext/standard/basic_functions.c
	ext/standard/html.c
	ext/standard/mail.c
	ext/standard/php_array.h
	ext/standard/proc_open.c
	ext/standard/streamsfuncs.c
	ext/standard/user_filters.c
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
	main/php_variables.c
	sapi/phpdbg/phpdbg.c
	sapi/phpdbg/phpdbg_bp.c
	sapi/phpdbg/phpdbg_frame.c
	sapi/phpdbg/phpdbg_help.c
	sapi/phpdbg/phpdbg_list.c
	sapi/phpdbg/phpdbg_print.c
	sapi/phpdbg/phpdbg_prompt.c

1 files changed, 76 insertions, 52 deletions

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index e7aaacb01e..741e0e3f07 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -600,6 +600,34 @@ static sapi_post_entry php_post_entries[] = {
 ZEND_GET_MODULE(mbstring)
 #endif
 
+static char *get_internal_encoding(TSRMLS_D) {
+	if (PG(internal_encoding) && PG(internal_encoding)[0]) {
+		return PG(internal_encoding);
+	} else if (SG(default_charset)) {
+		return SG(default_charset);
+	}
+	return "";
+}
+
+static char *get_input_encoding(TSRMLS_D) {
+	if (PG(input_encoding) && PG(input_encoding)[0]) {
+		return PG(input_encoding);
+	} else if (SG(default_charset)) {
+		return SG(default_charset);
+	}
+	return "";
+}
+
+static char *get_output_encoding(TSRMLS_D) {
+	if (PG(output_encoding) && PG(output_encoding)[0]) {
+		return PG(output_encoding);
+	} else if (SG(default_charset)) {
+		return SG(default_charset);
+	}
+	return "";
+}
+
+
 /* {{{ allocators */
 static void *_php_mb_allocators_malloc(unsigned int sz)
 {
@@ -1235,6 +1263,11 @@ static PHP_INI_MH(OnUpdate_mbstring_http_input)
 		if (MBSTRG(http_input_list)) {
 			pefree(MBSTRG(http_input_list), 1);
 		}
+		if (SUCCESS == php_mb_parse_encoding_list(get_input_encoding(TSRMLS_C), strlen(get_input_encoding(TSRMLS_C))+1, &list, &size, 1 TSRMLS_CC)) {
+			MBSTRG(http_input_list) = list;
+			MBSTRG(http_input_list_size) = size;
+			return SUCCESS;
+		}
 		MBSTRG(http_input_list) = NULL;
 		MBSTRG(http_input_list_size) = 0;
 		return SUCCESS;
@@ -1250,6 +1283,10 @@ static PHP_INI_MH(OnUpdate_mbstring_http_input)
 	MBSTRG(http_input_list) = list;
 	MBSTRG(http_input_list_size) = size;
 
+	if (stage & (PHP_INI_STAGE_ACTIVATE | PHP_INI_STAGE_RUNTIME)) {
+		php_error_docref("ref.mbstring" TSRMLS_CC, E_DEPRECATED, "Use of mbstring.http_input is deprecated");
+	}
+
 	return SUCCESS;
 }
 /* }}} */
@@ -1260,20 +1297,27 @@ static PHP_INI_MH(OnUpdate_mbstring_http_output)
 	const mbfl_encoding *encoding;
 
 	if (new_value == NULL || new_value_length == 0) {
-		MBSTRG(http_output_encoding) = &mbfl_encoding_pass;
-		MBSTRG(current_http_output_encoding) = &mbfl_encoding_pass;
-		return SUCCESS;
+		encoding = mbfl_name2encoding(get_output_encoding(TSRMLS_C));
+		if (!encoding) {
+			MBSTRG(http_output_encoding) = &mbfl_encoding_pass;
+			MBSTRG(current_http_output_encoding) = &mbfl_encoding_pass;
+			return SUCCESS;
+		}
+	} else {
+		encoding = mbfl_name2encoding(new_value);
+		if (!encoding) {
+			MBSTRG(http_output_encoding) = &mbfl_encoding_pass;
+			MBSTRG(current_http_output_encoding) = &mbfl_encoding_pass;
+			return FAILURE;
+		}
 	}
+	MBSTRG(http_output_encoding) = encoding;
+	MBSTRG(current_http_output_encoding) = encoding;
 
-	encoding = mbfl_name2encoding(new_value);
-	if (!encoding) {
-		MBSTRG(http_output_encoding) = &mbfl_encoding_pass;
-		MBSTRG(current_http_output_encoding) = &mbfl_encoding_pass;
-		return FAILURE;
+	if (stage & (PHP_INI_STAGE_ACTIVATE | PHP_INI_STAGE_RUNTIME)) {
+		php_error_docref("ref.mbstring" TSRMLS_CC, E_DEPRECATED, "Use of mbstring.http_output is deprecated");
 	}
 
-	MBSTRG(http_output_encoding) = encoding;
-	MBSTRG(current_http_output_encoding) = encoding;
 	return SUCCESS;
 }
 /* }}} */
@@ -1284,47 +1328,17 @@ int _php_mb_ini_mbstring_internal_encoding_set(const char *new_value, uint new_v
 	const mbfl_encoding *encoding;
 
 	if (!new_value || new_value_length == 0 || !(encoding = mbfl_name2encoding(new_value))) {
-  		switch (MBSTRG(language)) {
-  			case mbfl_no_language_uni:
-  				encoding = mbfl_no2encoding(mbfl_no_encoding_utf8);
-  				break;
-  			case mbfl_no_language_japanese:
-  				encoding = mbfl_no2encoding(mbfl_no_encoding_euc_jp);
-  				break;
-  			case mbfl_no_language_korean:
-  				encoding = mbfl_no2encoding(mbfl_no_encoding_euc_kr);
-  				break;
-  			case mbfl_no_language_simplified_chinese:
-  				encoding = mbfl_no2encoding(mbfl_no_encoding_euc_cn);
-  				break;
-  			case mbfl_no_language_traditional_chinese:
-  				encoding = mbfl_no2encoding(mbfl_no_encoding_euc_tw);
-  				break;
-  			case mbfl_no_language_russian:
-  				encoding = mbfl_no2encoding(mbfl_no_encoding_koi8r);
-  				break;
-  			case mbfl_no_language_german:
-  				encoding = mbfl_no2encoding(mbfl_no_encoding_8859_15);
-  				break;
-  			case mbfl_no_language_armenian:
-  				encoding = mbfl_no2encoding(mbfl_no_encoding_armscii8);
-  				break;
-  			case mbfl_no_language_turkish:
-  				encoding = mbfl_no2encoding(mbfl_no_encoding_8859_9);
-  				break;
-  			default:
-  				encoding = mbfl_no2encoding(mbfl_no_encoding_8859_1);
-  				break;
-  		}
-  	}
+		/* falls back to UTF-8 if an unknown encoding name is given */
+		encoding = mbfl_no2encoding(mbfl_no_encoding_utf8);
+	}
 	MBSTRG(internal_encoding) = encoding;
 	MBSTRG(current_internal_encoding) = encoding;
 #if HAVE_MBREGEX
 	{
 		const char *enc_name = new_value;
 		if (FAILURE == php_mb_regex_set_default_mbctype(enc_name TSRMLS_CC)) {
-			/* falls back to EUC-JP if an unknown encoding name is given */
-			enc_name = "EUC-JP";
+			/* falls back to UTF-8 if an unknown encoding name is given */
+			enc_name = "UTF-8";
 			php_mb_regex_set_default_mbctype(enc_name TSRMLS_CC);
 		}
 		php_mb_regex_set_mbctype(new_value TSRMLS_CC);
@@ -1337,12 +1351,20 @@ int _php_mb_ini_mbstring_internal_encoding_set(const char *new_value, uint new_v
 /* {{{ static PHP_INI_MH(OnUpdate_mbstring_internal_encoding) */
 static PHP_INI_MH(OnUpdate_mbstring_internal_encoding)
 {
+	if (stage & (PHP_INI_STAGE_ACTIVATE | PHP_INI_STAGE_RUNTIME)) {
+		php_error_docref("ref.mbstring" TSRMLS_CC, E_DEPRECATED, "Use of mbstring.internal_encoding is deprecated");
+	}
+
 	if (OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC) == FAILURE) {
 		return FAILURE;
 	}
-	if (stage == PHP_INI_STAGE_STARTUP || stage == PHP_INI_STAGE_SHUTDOWN
-			|| stage == PHP_INI_STAGE_RUNTIME) {
-		return _php_mb_ini_mbstring_internal_encoding_set(new_value, new_value_length TSRMLS_CC);
+
+	if (stage & (PHP_INI_STAGE_STARTUP | PHP_INI_STAGE_SHUTDOWN | PHP_INI_STAGE_RUNTIME)) {
+		if (new_value_length) {
+			return _php_mb_ini_mbstring_internal_encoding_set(new_value, new_value_length TSRMLS_CC);
+		} else {
+			return _php_mb_ini_mbstring_internal_encoding_set(get_internal_encoding(TSRMLS_C), strlen(get_internal_encoding(TSRMLS_C))+1 TSRMLS_CC);
+		}
 	} else {
 		/* the corresponding mbstring globals needs to be set according to the
 		 * ini value in the later stage because it never falls back to the
@@ -1449,8 +1471,8 @@ static PHP_INI_MH(OnUpdate_mbstring_http_output_conv_mimetypes)
 PHP_INI_BEGIN()
 	PHP_INI_ENTRY("mbstring.language", "neutral", PHP_INI_ALL, OnUpdate_mbstring_language)
 	PHP_INI_ENTRY("mbstring.detect_order", NULL, PHP_INI_ALL, OnUpdate_mbstring_detect_order)
-	PHP_INI_ENTRY("mbstring.http_input", "pass", PHP_INI_ALL, OnUpdate_mbstring_http_input)
-	PHP_INI_ENTRY("mbstring.http_output", "pass", PHP_INI_ALL, OnUpdate_mbstring_http_output)
+	PHP_INI_ENTRY("mbstring.http_input", NULL, PHP_INI_ALL, OnUpdate_mbstring_http_input)
+	PHP_INI_ENTRY("mbstring.http_output", NULL, PHP_INI_ALL, OnUpdate_mbstring_http_output)
 	STD_PHP_INI_ENTRY("mbstring.internal_encoding", NULL, PHP_INI_ALL, OnUpdate_mbstring_internal_encoding, internal_encoding_name, zend_mbstring_globals, mbstring_globals)
 	PHP_INI_ENTRY("mbstring.substitute_character", NULL, PHP_INI_ALL, OnUpdate_mbstring_substitute_character)
 	STD_PHP_INI_ENTRY("mbstring.func_overload", "0", 
@@ -2162,8 +2184,10 @@ PHP_FUNCTION(mb_output_handler)
  
  	/* feed the string */
  	mbfl_string_init(&string);
- 	string.no_language = MBSTRG(language);
- 	string.no_encoding = MBSTRG(current_internal_encoding)->no_encoding;
+	/* these are not needed. convd has encoding info.
+	string.no_language = MBSTRG(language);
+	string.no_encoding = MBSTRG(current_internal_encoding)->no_encoding;
+	*/
  	string.val = (unsigned char *)arg_string;
  	string.len = arg_string_len;
  	mbfl_buffer_converter_feed(MBSTRG(outconv), &string);