cvs: php4 /ext/mbstring mbstring.c /main internal_functions_win32.c

hirokawa Sun Jul 29 18:15:45 2001 EDT Modified files: /php4/ext/mbstring mbstring.c /php4/main internal_functions_win32.c Log: changed for input encoding conversion in win32. Index: php4/ext/mbstring/mbstring.c diff -u php4/ext/mbstring/mbstring.c:1.23 php4/ext/mbstring/mbstring.c:1.24 --- php4/ext/mbstring/mbstring.c:1.23 Sat Jul 28 07:35:58 2001 +++ php4/ext/mbstring/mbstring.c Sun Jul 29 18:15:40 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mbstring.c,v 1.23 2001/07/28 11:35:58 zeev Exp $ */ +/* $Id: mbstring.c,v 1.24 2001/07/29 22:15:40 hirokawa Exp $ */ /* * PHP4 Multibyte String module "mbstring" (currently only for Japanese) @@ -76,6 +76,7 @@ static int php_mbstr_default_identify_list_size = sizeof(php_mbstr_default_identify_list)/sizeof(enum mbfl_no_encoding); static unsigned char third_and_rest_force_ref[] = { 3, BYREF_NONE, BYREF_NONE, BYREF_FORCE_REST }; +static unsigned char second_args_force_ref[] = { 2, BYREF_NONE, BYREF_FORCE }; #if defined(MBSTR_ENC_TRANS) SAPI_POST_HANDLER_FUNC(php_mbstr_post_handler); @@ -94,7 +95,7 @@ PHP_FE(mb_http_output, NULL) PHP_FE(mb_detect_order, NULL) PHP_FE(mb_substitute_character, NULL) - PHP_FE(mb_parse_str, second_arg_force_ref) + PHP_FE(mb_parse_str, second_args_force_ref) PHP_FE(mb_output_handler, NULL) PHP_FE(mb_preferred_mime_name, NULL) PHP_FE(mb_strlen, NULL) @@ -930,6 +931,7 @@ } +#if !defined(COMPILE_DL_MBSTRING) SAPI_POST_HANDLER_FUNC(php_mbstr_post_handler) { TSRMLS_FETCH(); @@ -942,6 +944,7 @@ MBSTRG(http_input_identify_post) = MBSTRG(http_input_identify); } } +#endif /* http input processing */ void mbstr_treat_data(int arg, char *str, zval* destArray TSRMLS_DC) Index: php4/main/internal_functions_win32.c diff -u php4/main/internal_functions_win32.c:1.43 php4/main/internal_functions_win32.c:1.44 --- php4/main/internal_functions_win32.c:1.43 Tue Jul 24 16:30:33 2001 +++ php4/main/internal_functions_win32.c Sun Jul 29 18:15:41 2001 @@ -18,7 +18,7 @@ */ -/* $Id: internal_functions_win32.c,v 1.43 2001/07/24 20:30:33 zeev Exp $ */ +/* $Id: internal_functions_win32.c,v 1.44 2001/07/29 22:15:41 hirokawa Exp $ */ /* {{{ includes */ @@ -60,6 +60,7 @@ #include "ext/xml/php_xml.h" #include "ext/wddx/php_wddx.h" #include "ext/mysql/php_mysql.h" +#include "ext/mysql/mbstring.h" /* }}} */ /* {{{ php_builtin_extensions[] @@ -73,6 +74,9 @@ COM_module_ptr, VARIANT_module_ptr, phpext_ftp_ptr, +#if defined(MBSTR_ENC_TRANS) + phpext_mbstring_ptr, +#endif phpext_mysql_ptr, phpext_odbc_ptr, phpext_pcre_ptr,