clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 18:37:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #35730 Use correct character encoding with FreeTDS

Browse Source
This commit is contained in:
Frank M. Kromann 2005-12-21 22:44:04 +00:00
parent 42a83a6fc9
commit 8560728ae0
5 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -26,4 +26,5 @@ PHP NEWS
the part of haystack before or after first occurence of needle. (Johannes)
- Added possibility to check in which extension an internal function was
defined using reflection API. (Johannes)
- Fixed bug #35730 (Use correct character encoding, and allow setting it) (Frank)
- Fixed bug #34286 (__toString() behavior is inconsistent). (Marcus)

7
ext/mssql/php_mssql.c
View File

@ -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));

3
ext/mssql/php_mssql.h
View File

@ -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;

5
php.ini-dist
View File

@ -1046,6 +1046,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

5
php.ini-recommended
View File

@ -1103,6 +1103,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