cvs: php4 / php.ini-dist php.ini-recommended /ext/mbstring mbstring.c /ext/pgsql pgsql.c

hirokawa Thu Jul 11 11:45:36 2002 EDT Modified files: /php4 php.ini-dist php.ini-recommended /php4/ext/mbstring mbstring.c /php4/ext/pgsql pgsql.c Log: added mbstring.language option in ext/mbstring. Index: php4/php.ini-dist diff -u php4/php.ini-dist:1.131 php4/php.ini-dist:1.132 --- php4/php.ini-dist:1.131 Wed Jun 26 15:43:46 2002 +++ php4/php.ini-dist Thu Jul 11 11:45:33 2002 @@ -898,6 +898,9 @@ ;printer.default_printer = "" [mbstring] +; language for internal character representation. +;mbstring.language = Japanese + ; internal/script encoding. ; Some encoding cannot work as internal encoding. ; (e.g. SJIS, BIG5, ISO-2022-*) Index: php4/php.ini-recommended diff -u php4/php.ini-recommended:1.84 php4/php.ini-recommended:1.85 --- php4/php.ini-recommended:1.84 Wed Jun 26 15:43:46 2002 +++ php4/php.ini-recommended Thu Jul 11 11:45:34 2002 @@ -905,6 +905,9 @@ ;printer.default_printer = "" [mbstring] +; language for internal character representation. +;mbstring.language = Japanese + ; internal/script encoding. ; Some encoding cannot work as internal encoding. ; (e.g. SJIS, BIG5, ISO-2022-*) Index: php4/ext/mbstring/mbstring.c diff -u php4/ext/mbstring/mbstring.c:1.78 php4/ext/mbstring/mbstring.c:1.79 --- php4/ext/mbstring/mbstring.c:1.78 Fri Jul 5 11:06:39 2002 +++ php4/ext/mbstring/mbstring.c Thu Jul 11 11:45:34 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mbstring.c,v 1.78 2002/07/05 15:06:39 hirokawa Exp $ */ +/* $Id: mbstring.c,v 1.79 2002/07/11 15:45:34 hirokawa Exp $ */ /* * PHP4 Multibyte String module "mbstring" (currently only for Japanese) @@ -462,7 +462,61 @@ #endif + /* php.ini directive handler */ +static PHP_INI_MH(OnUpdate_mbstring_language) +{ + int *list, size; + enum mbfl_no_language no_language; + + no_language = mbfl_name2no_language(new_value); + if (no_language != mbfl_no_language_invalid) { + switch (no_language) { + case mbfl_no_language_japanese: + MBSTRG(language) = mbfl_no_language_japanese; + MBSTRG(current_language) = mbfl_no_language_japanese; + MBSTRG(internal_encoding) = mbfl_no_encoding_euc_jp; + MBSTRG(current_internal_encoding) = mbfl_no_encoding_euc_jp; + break; + case mbfl_no_language_korean: + MBSTRG(language) = mbfl_no_language_korean; + MBSTRG(current_language) = mbfl_no_language_korean; + MBSTRG(internal_encoding) = mbfl_no_encoding_euc_kr; + MBSTRG(current_internal_encoding) = mbfl_no_encoding_euc_kr; + break; + case mbfl_no_language_simplified_chinese: + MBSTRG(language) = mbfl_no_language_simplified_chinese; + MBSTRG(current_language) = mbfl_no_language_simplified_chinese; + MBSTRG(internal_encoding) = mbfl_no_encoding_euc_cn; + MBSTRG(current_internal_encoding) = mbfl_no_encoding_euc_cn; + break; + case mbfl_no_language_traditional_chinese: + MBSTRG(language) = mbfl_no_language_traditional_chinese; + MBSTRG(current_language) = mbfl_no_language_traditional_chinese; + MBSTRG(internal_encoding) = mbfl_no_encoding_euc_tw; + MBSTRG(current_internal_encoding) = mbfl_no_encoding_euc_tw; + break; + case mbfl_no_language_russian: + MBSTRG(language) = mbfl_no_language_russian; + MBSTRG(current_language) = mbfl_no_language_russian; + MBSTRG(internal_encoding) = mbfl_no_encoding_koi8r; + MBSTRG(current_internal_encoding) = mbfl_no_encoding_koi8r; + break; + case mbfl_no_language_english: + default: + MBSTRG(language) = mbfl_no_language_english; + MBSTRG(current_language) = mbfl_no_language_english; + MBSTRG(internal_encoding) = mbfl_no_encoding_8859_1; + MBSTRG(current_internal_encoding) = mbfl_no_encoding_8859_1; + break; + } + + } else { + return FAILURE; + } + return SUCCESS; +} + static PHP_INI_MH(OnUpdate_mbstring_detect_order) { int *list, size; @@ -497,6 +551,7 @@ return SUCCESS; } + static PHP_INI_MH(OnUpdate_mbstring_http_output) { enum mbfl_no_encoding no_encoding; @@ -582,6 +637,7 @@ /* php.ini directive registration */ PHP_INI_BEGIN() + PHP_INI_ENTRY("mbstring.language", NULL, PHP_INI_ALL, 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) @@ -598,20 +654,25 @@ static void php_mbstring_init_globals(zend_mbstring_globals *pglobals TSRMLS_DC) { + MBSTRG(language) = mbfl_no_language_english; + MBSTRG(current_language) = mbfl_no_language_english; + MBSTRG(internal_encoding) = mbfl_no_encoding_8859_1; + MBSTRG(current_internal_encoding) = mbfl_no_encoding_8859_1; + #if defined(HAVE_MBSTR_CN) & !defined(HAVE_MBSTR_JA) - MBSTRG(language) = mbfl_no_language_chinese; - MBSTRG(current_language) = mbfl_no_language_chinese; + MBSTRG(language) = mbfl_no_language_simplified_chinese; + MBSTRG(current_language) = mbfl_no_language_simplified_chinese; MBSTRG(internal_encoding) = mbfl_no_encoding_euc_cn; MBSTRG(current_internal_encoding) = mbfl_no_encoding_euc_cn; #endif #if defined(HAVE_MBSTR_TW) & !defined(HAVE_MBSTR_JA) - MBSTRG(language) = mbfl_no_language_chinese; - MBSTRG(current_language) = mbfl_no_language_chinese; + MBSTRG(language) = mbfl_no_language_traditional_chinese; + MBSTRG(current_language) = mbfl_no_language_traditional_chinese; MBSTRG(internal_encoding) = mbfl_no_encoding_euc_tw; MBSTRG(current_internal_encoding) = mbfl_no_encoding_euc_tw; #endif #if defined(HAVE_MBSTR_KR) & !defined(HAVE_MBSTR_JA) - MBSTRG(language) = mbfl_no_language_chinese; + MBSTRG(language) = mbfl_no_language_korean; MBSTRG(current_language) = mbfl_no_language_korean; MBSTRG(internal_encoding) = mbfl_no_encoding_euc_kr; MBSTRG(current_internal_encoding) = mbfl_no_encoding_euc_kr; Index: php4/ext/pgsql/pgsql.c diff -u php4/ext/pgsql/pgsql.c:1.201 php4/ext/pgsql/pgsql.c:1.202 --- php4/ext/pgsql/pgsql.c:1.201 Sun May 19 21:40:22 2002 +++ php4/ext/pgsql/pgsql.c Thu Jul 11 11:45:35 2002 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql.c,v 1.201 2002/05/20 01:40:22 yohgaki Exp $ */ +/* $Id: pgsql.c,v 1.202 2002/07/11 15:45:35 hirokawa Exp $ */ #include <stdlib.h> @@ -1457,7 +1457,7 @@ } /* }}} */ -/* {{{ proto int pg_last_oid(resource result) +/* {{{ proto string pg_last_oid(resource result) Returns the last object identifier */ PHP_FUNCTION(pg_last_oid) { @@ -1575,7 +1575,7 @@ } /* }}} */ -/* {{{ proto int pg_lo_create(resource connection) +/* {{{ proto int pg_lo_create([resource connection]) Create a large object */ PHP_FUNCTION(pg_lo_create) { @@ -1618,7 +1618,7 @@ } /* }}} */ -/* {{{ proto bool pg_lo_unlink([resource connection,] int large_object_oid) +/* {{{ proto bool pg_lo_unlink([resource connection,] string large_object_oid) Delete a large object */ PHP_FUNCTION(pg_lo_unlink) {