From: Rui Hirokawa <hirokawa@php.net>
Date: Sat, 23 Feb 2002 00:04:20 +0000 (+0000)
Subject: fixed a comment and default output encoding changed to pass.
X-Git-Tag: php-4.2.0RC1~295
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=07a08288a1f0cc54004d422843003986b07cc34b;p=php

fixed a comment and default output encoding changed to pass.
---

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 898055de15..1339cc3ad9 100644
--- 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 bd3069b98e..b71b9e4882 100644
--- 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;