fixed a comment and default output encoding changed to pass.

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 898055de15e00668c722311c9a83238b73484928..1339cc3ad9a025229914af21e76f976446991e30 100644 (file)
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -479,8 +479,8 @@ php_mbstring_init_globals(zend_mbstring_globals *pglobals)
        pglobals->current_language = mbfl_no_language_japanese;
        pglobals->internal_encoding = mbfl_no_encoding_euc_jp;
        pglobals->current_internal_encoding = mbfl_no_encoding_euc_jp;
-       pglobals->http_output_encoding = mbfl_no_encoding_invalid;
-       pglobals->current_http_output_encoding = mbfl_no_encoding_invalid;
+       pglobals->http_output_encoding = mbfl_no_encoding_pass;
+       pglobals->current_http_output_encoding = mbfl_no_encoding_pass;
        pglobals->http_input_identify = mbfl_no_encoding_invalid;
        pglobals->http_input_identify_get = mbfl_no_encoding_invalid;
        pglobals->http_input_identify_post = mbfl_no_encoding_invalid;

diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c
index bd3069b98ec1aa83bec0297e2e1fc6ea53399a85..b71b9e4882900d12976323493d88032165ed3079 100644 (file)
--- a/ext/mbstring/php_mbregex.c
+++ b/ext/mbstring/php_mbregex.c
@@ -231,7 +231,7 @@ php_mbregex_init_option(const char *parg, int narg, int *option, int *eval)
  */
 
 /* {{{ proto string mb_regex_encoding([string encoding])
-   Returns the current encoding as a string. */
+   Returns the current encoding for regex as a string. */
 PHP_FUNCTION(mb_regex_encoding)
 {
        zval **arg1;