diff options
| author | Frank M. Kromann <fmk@php.net> | 2005-12-21 22:44:04 +0000 |
|---|---|---|
| committer | Frank M. Kromann <fmk@php.net> | 2005-12-21 22:44:04 +0000 |
| commit | 8560728ae081ae8bbb11ca86931d04d7af14e45d (patch) | |
| tree | d6329a22599f1e0fd5d594e022c12149387f77d6 /ext/mssql/php_mssql.c | |
| parent | 42a83a6fc97d3a1017f2230471c017b2ab0b5715 (diff) | |
| download | php-git-8560728ae081ae8bbb11ca86931d04d7af14e45d.tar.gz | |
Fix #35730 Use correct character encoding with FreeTDS
Diffstat (limited to 'ext/mssql/php_mssql.c')
| -rw-r--r-- | ext/mssql/php_mssql.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c index e9a7f064ec..554d834b9a 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)); |