diff options
| author | Frank M. Kromann <fmk@php.net> | 2005-12-21 22:43:06 +0000 |
|---|---|---|
| committer | Frank M. Kromann <fmk@php.net> | 2005-12-21 22:43:06 +0000 |
| commit | a7d2ac4189f536386c43d7e806b6e45a46c758d5 (patch) | |
| tree | 7e5411a75177d5edfac9d2aaee47c430ba427add | |
| parent | 970298401b4f7b0fd63a8a68cf1cee8000b89c2c (diff) | |
| download | php-git-a7d2ac4189f536386c43d7e806b6e45a46c758d5.tar.gz | |
Fix #35730 Use correct character encoding with FreeTDS
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | ext/mssql/php_mssql.c | 9 | ||||
| -rw-r--r-- | ext/mssql/php_mssql.h | 3 | ||||
| -rw-r--r-- | php.ini-dist | 5 | ||||
| -rw-r--r-- | php.ini-recommended | 5 |
5 files changed, 21 insertions, 2 deletions
@@ -34,6 +34,7 @@ PHP NEWS connecting to 5.x server. (Andrey) - Fixed bug #35760 (sybase_ct doesn't compile on Solaris using old gcc). (Tony) - Fixed bug #35740 (memory leak when including a directory). (Tony) +- Fixed bug #35730 (Use correct character encoding, and allow setting it) (Frank) - Fixed bug #35723 (xmlrpc_introspection.c fails compile per C99 std). (Jani) - Fixed bug #35720 (A final constructor can be overwritten). (Marcus) - Fixed bug #35713 (getopt() returns array with numeric strings when passed diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c index 7a72608189..7b7a81844b 100644 --- a/ext/mssql/php_mssql.c +++ b/ext/mssql/php_mssql.c @@ -141,6 +141,9 @@ PHP_INI_BEGIN() STD_PHP_INI_BOOLEAN("mssql.datetimeconvert", "1", PHP_INI_ALL, OnUpdateBool, datetimeconvert, zend_mssql_globals, mssql_globals) STD_PHP_INI_BOOLEAN("mssql.secure_connection", "0", PHP_INI_SYSTEM, OnUpdateBool, secure_connection, zend_mssql_globals, mssql_globals) STD_PHP_INI_ENTRY_EX("mssql.max_procs", "-1", PHP_INI_ALL, OnUpdateLong, max_procs, zend_mssql_globals, mssql_globals, display_link_numbers) +#ifdef HAVE_FREETDS + STD_PHP_INI_ENTRY("mssql.charset", "", PHP_INI_ALL, OnUpdateString, charset, zend_mssql_globals, mssql_globals) +#endif PHP_INI_END() /* error handler */ @@ -495,7 +498,9 @@ static void php_mssql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) #endif #ifdef HAVE_FREETDS - DBSETLCHARSET(mssql.login, "ISO-8859-1"); + if (MS_SQL_G(charset) && strlen(MS_SQL_G(charset))) { + DBSETLCHARSET(mssql.login, MS_SQL_G(charset)); + } #endif DBSETLAPP(mssql.login,MS_SQL_G(appname)); @@ -1009,7 +1014,7 @@ static void _mssql_get_sp_result(mssql_link *mssql_ptr, mssql_statement *stateme /* Now to fetch RETVAL and OUTPUT values*/ num_rets = dbnumrets(mssql_ptr->link); - + if (num_rets!=0) { for (i = 1; i <= num_rets; i++) { parameter = (char*)dbretname(mssql_ptr->link, i); diff --git a/ext/mssql/php_mssql.h b/ext/mssql/php_mssql.h index 17e5d4d10e..9c668ef368 100644 --- a/ext/mssql/php_mssql.h +++ b/ext/mssql/php_mssql.h @@ -158,6 +158,9 @@ ZEND_BEGIN_MODULE_GLOBALS(mssql) zend_bool allow_persistent; char *appname; char *server_message; +#ifdef HAVE_FREETDS + char *charset; +#endif long min_error_severity, min_message_severity; long cfg_min_error_severity, cfg_min_message_severity; long connect_timeout, timeout; diff --git a/php.ini-dist b/php.ini-dist index 55613d7a57..e1405ada52 100644 --- a/php.ini-dist +++ b/php.ini-dist @@ -1035,6 +1035,11 @@ mssql.secure_connection = Off ; FreeTDS defaults to 4096 ;mssql.max_procs = -1 +; Specify client character set. +; If empty or not set the client charset from freetds.comf is used +; This is only used when compiled with FreeTDS +;mssql.charset = "ISO-8859-1" + [Assertion] ; Assert(expr); active by default. ;assert.active = On diff --git a/php.ini-recommended b/php.ini-recommended index 0f8078e951..65625975f5 100644 --- a/php.ini-recommended +++ b/php.ini-recommended @@ -1093,6 +1093,11 @@ mssql.secure_connection = Off ; FreeTDS defaults to 4096 ;mssql.max_procs = -1 +; Specify client character set. +; If empty or not set the client charset from freetds.comf is used +; This is only used when compiled with FreeTDS +;mssql.charset = "ISO-8859-1" + [Assertion] ; Assert(expr); active by default. ;assert.active = On |