diff options
| author | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 19:39:21 -0400 |
|---|---|---|
| committer | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 19:39:21 -0400 |
| commit | 6821b67124604da690c5e9276d5370d679c63ac8 (patch) | |
| tree | befb4ca2520eb577950cef6cb76d10b914cbf67a /ext/mbstring/mb_gpc.c | |
| parent | cd0b49c72aee33b3e44a9c589fcd93b9e1c7a64f (diff) | |
| download | php-6821b67124604da690c5e9276d5370d679c63ac8.tar.gz | |
Imported Upstream version 5.3.0RC1upstream/5.3.0_RC1upstream/5.3.0RC1
Diffstat (limited to 'ext/mbstring/mb_gpc.c')
| -rw-r--r-- | ext/mbstring/mb_gpc.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ext/mbstring/mb_gpc.c b/ext/mbstring/mb_gpc.c index 98efdcbe1..5e6d0ac17 100644 --- a/ext/mbstring/mb_gpc.c +++ b/ext/mbstring/mb_gpc.c @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mb_gpc.c,v 1.17.2.2.2.5 2008/12/31 11:17:39 sebastian Exp $ */ +/* $Id: mb_gpc.c,v 1.17.2.2.2.3.2.3 2009/03/15 20:42:56 moriyoshi Exp $ */ /* {{{ includes */ #ifdef HAVE_CONFIG_H @@ -59,6 +59,11 @@ MBSTRING_API SAPI_TREAT_DATA_FUNC(mbstr_treat_data) enum mbfl_no_encoding detected; php_mb_encoding_handler_info_t info; + { + char *value = zend_ini_string("mbstring.internal_encoding", sizeof("mbstring.internal_encoding"), 0); + _php_mb_ini_mbstring_internal_encoding_set(value, value ? strlen(value): 0 TSRMLS_CC); + } + if (!MBSTRG(encoding_translation)) { php_default_treat_data(arg, str, destArray TSRMLS_CC); return; |