Re: cvs: php4 /ext/mbstring mbstring.c

Hello, I think this change won't enough for the expected behaviour, because sapi_register_treat_data(mbstr_treat_data); is only invoked in tne PHP_MINIT_FUNCTION(mbstring), and would never be invoked on a request when the encoding_translation is turned off globally, and it is on in per-dir settings, though. "Rui Hirokawa" <rui_hirokawa@ybb.ne.jp> wrote: > hirokawa Fri Oct 11 21:18:44 2002 EDT > > Modified files: > /php4/ext/mbstring mbstring.c > Log: > changed INI restriction to enable per-directory settings. > > > Index: php4/ext/mbstring/mbstring.c > diff -u php4/ext/mbstring/mbstring.c:1.101 php4/ext/mbstring/mbstring.c:1.102 > --- php4/ext/mbstring/mbstring.c:1.101 Tue Oct 8 13:20:10 2002 > +++ php4/ext/mbstring/mbstring.c Fri Oct 11 21:18:43 2002 > @@ -17,7 +17,7 @@ > +----------------------------------------------------------------------+ > */ > > -/* $Id: mbstring.c,v 1.101 2002/10/08 17:20:10 moriyoshi Exp $ */ > +/* $Id: mbstring.c,v 1.102 2002/10/12 01:18:43 hirokawa Exp $ */ > > /* > * PHP4 Multibyte String module "mbstring" (currently only for Japanese) > @@ -646,7 +646,7 @@ > > /* php.ini directive registration */ > PHP_INI_BEGIN() > - PHP_INI_ENTRY("mbstring.language", NULL, PHP_INI_ALL, OnUpdate_mbstring_language) > + PHP_INI_ENTRY("mbstring.language", NULL, PHP_INI_SYSTEM | PHP_INI_PERDIR, > OnUpdate_mbstring_language) > PHP_INI_ENTRY("mbstring.detect_order", NULL, PHP_INI_ALL, > OnUpdate_mbstring_detect_order) > PHP_INI_ENTRY("mbstring.http_input", NULL, PHP_INI_ALL, > OnUpdate_mbstring_http_input) > PHP_INI_ENTRY("mbstring.http_output", NULL, PHP_INI_ALL, > OnUpdate_mbstring_http_output) > @@ -655,8 +655,10 @@ > PHP_INI_ENTRY("mbstring.script_encoding", NULL, PHP_INI_ALL, > OnUpdate_mbstring_script_encoding) > #endif /* ZEND_MULTIBYTE */ > PHP_INI_ENTRY("mbstring.substitute_character", NULL, PHP_INI_ALL, > OnUpdate_mbstring_substitute_character) > - STD_PHP_INI_ENTRY("mbstring.func_overload", "0", PHP_INI_SYSTEM, > OnUpdateInt, func_overload, zend_mbstring_globals, mbstring_globals) > - STD_PHP_INI_BOOLEAN("mbstring.encoding_translation", "0", PHP_INI_ALL, > OnUpdateBool, encoding_translation, zend_mbstring_globals, mbstring_globals) > + STD_PHP_INI_ENTRY("mbstring.func_overload", "0", PHP_INI_SYSTEM | > + PHP_INI_PERDIR, OnUpdateInt, func_overload, zend_mbstring_globals, mbstring_globals) > + STD_PHP_INI_BOOLEAN("mbstring.encoding_translation", "0", > + PHP_INI_SYSTEM | PHP_INI_PERDIR, OnUpdateBool, encoding_translation, zend_mbstring_globals, > mbstring_globals) > PHP_INI_END() > > > > > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php >