diff options
| -rw-r--r-- | ext/mbstring/mbstring.c | 5 | ||||
| -rw-r--r-- | main/internal_functions_win32.c | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index 5f76a4dcfe..845350a76f 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -76,6 +76,7 @@ static enum mbfl_no_encoding php_mbstr_default_identify_list[] = { static int php_mbstr_default_identify_list_size = sizeof(php_mbstr_default_identify_list)/sizeof(enum mbfl_no_encoding); static unsigned char third_and_rest_force_ref[] = { 3, BYREF_NONE, BYREF_NONE, BYREF_FORCE_REST }; +static unsigned char second_args_force_ref[] = { 2, BYREF_NONE, BYREF_FORCE }; #if defined(MBSTR_ENC_TRANS) SAPI_POST_HANDLER_FUNC(php_mbstr_post_handler); @@ -94,7 +95,7 @@ function_entry mbstring_functions[] = { PHP_FE(mb_http_output, NULL) PHP_FE(mb_detect_order, NULL) PHP_FE(mb_substitute_character, NULL) - PHP_FE(mb_parse_str, second_arg_force_ref) + PHP_FE(mb_parse_str, second_args_force_ref) PHP_FE(mb_output_handler, NULL) PHP_FE(mb_preferred_mime_name, NULL) PHP_FE(mb_strlen, NULL) @@ -930,6 +931,7 @@ php_mbstr_encoding_handler(zval *arg, char *res, char *separator) } +#if !defined(COMPILE_DL_MBSTRING) SAPI_POST_HANDLER_FUNC(php_mbstr_post_handler) { TSRMLS_FETCH(); @@ -942,6 +944,7 @@ SAPI_POST_HANDLER_FUNC(php_mbstr_post_handler) MBSTRG(http_input_identify_post) = MBSTRG(http_input_identify); } } +#endif /* http input processing */ void mbstr_treat_data(int arg, char *str, zval* destArray TSRMLS_DC) diff --git a/main/internal_functions_win32.c b/main/internal_functions_win32.c index 9666ef4085..642f81a6be 100644 --- a/main/internal_functions_win32.c +++ b/main/internal_functions_win32.c @@ -60,6 +60,7 @@ #include "ext/xml/php_xml.h" #include "ext/wddx/php_wddx.h" #include "ext/mysql/php_mysql.h" +#include "ext/mysql/mbstring.h" /* }}} */ /* {{{ php_builtin_extensions[] @@ -73,6 +74,9 @@ zend_module_entry *php_builtin_extensions[] = { COM_module_ptr, VARIANT_module_ptr, phpext_ftp_ptr, +#if defined(MBSTR_ENC_TRANS) + phpext_mbstring_ptr, +#endif phpext_mysql_ptr, phpext_odbc_ptr, phpext_pcre_ptr, |