--enable-mbstr-enc-trans is abolished to prevent some problems about POST/GET/Cookie...

diff --git a/ext/mbstring/config.m4 b/ext/mbstring/config.m4
index a0656c11f32398477d91a141abf6a7214047ab9e..ec02b68aafbf03acd23bbeb77d1f1a225fe7dc63 100644 (file)
--- a/ext/mbstring/config.m4
+++ b/ext/mbstring/config.m4
@@ -31,8 +31,6 @@ if test "$PHP_MBSTRING" != "no"; then
     AC_DEFINE(HAVE_MBSTR_RU,1,[whether to have russian support])
   fi
   PHP_NEW_EXTENSION(mbstring, mbfilter_ja.c mbfilter_cn.c mbfilter_tw.c mbfilter_kr.c mbfilter_ru.c mbfilter.c mbstring.c mbregex.c php_mbregex.c html_entities.c, $ext_shared)
-else
-  PHP_MBSTR_ENC_TRANS=no
 fi
 
 
@@ -43,10 +41,5 @@ if test "$MBREGEX" != "no" ; then
   AC_DEFINE(HAVE_MBREGEX, 1, [whether to have multibyte regex support])
 fi
 
-PHP_ARG_ENABLE(mbstr_enc_trans, whether to enable encoding translation,
-[  --enable-mbstr-enc-trans  Enable input encoding translation], no)
 
-if test "$PHP_MBSTR_ENC_TRANS" != "no" ; then
-  AC_DEFINE(MBSTR_ENC_TRANS, 1, [whether to have encoding translation])
-fi
 

diff --git a/main/config.w32.h.in b/main/config.w32.h.in
index fa5b19a24f5a8141fccdfe0d5d025c11e85d175e..c6c1c050b0bad9ada94a835cc7b97e735605c272 100644 (file)
--- a/main/config.w32.h.in
+++ b/main/config.w32.h.in
@@ -48,7 +48,6 @@
 #define HAVE_MBSTR_KR 1
 #define HAVE_MBSTR_RU 1
 #define HAVE_MBSTR_TW 1
-#define MBSTR_ENC_TRANS 1
 
 /* Enable / Disable MySQL extension (default: enabled) */
 #define HAVE_MYSQL 1