]>
Commit | Line | Data |
---|---|---|
1 | --- php-5.3.1/ext/mysqli/mysqli.c~ 2010-02-20 00:58:34.000000000 +0200 | |
2 | +++ php-5.3.1/ext/mysqli/mysqli.c 2010-02-20 01:00:22.459111311 +0200 | |
3 | @@ -602,6 +602,7 @@ | |
4 | #else | |
5 | STD_PHP_INI_ENTRY("mysqli.default_socket", NULL, PHP_INI_ALL, OnUpdateStringUnempty, default_socket, zend_mysqli_globals, mysqli_globals) | |
6 | #endif | |
7 | + STD_PHP_INI_ENTRY("mysqli.connect_charset", NULL, PHP_INI_ALL, OnUpdateString, connect_charset, zend_mysqli_globals, mysqli_globals) | |
8 | STD_PHP_INI_BOOLEAN("mysqli.reconnect", "0", PHP_INI_SYSTEM, OnUpdateLong, reconnect, zend_mysqli_globals, mysqli_globals) | |
9 | STD_PHP_INI_BOOLEAN("mysqli.allow_local_infile", "1", PHP_INI_SYSTEM, OnUpdateLong, allow_local_infile, zend_mysqli_globals, mysqli_globals) | |
10 | #ifdef MYSQLI_USE_MYSQLND | |
11 | @@ -475,6 +476,7 @@ | |
12 | mysqli_globals->default_user = NULL; | |
13 | mysqli_globals->default_pw = NULL; | |
14 | mysqli_globals->default_socket = NULL; | |
15 | + mysqli_globals->connect_charset = NULL; | |
16 | mysqli_globals->reconnect = 0; | |
17 | mysqli_globals->report_mode = 0; | |
18 | mysqli_globals->report_ht = 0; | |
19 | --- php-5.3.4/ext/mysqli/mysqli_nonapi.c~ 2010-12-12 23:07:03.000000000 +0200 | |
20 | +++ php-5.3.4/ext/mysqli/mysqli_nonapi.c 2010-12-12 23:07:36.497424912 +0200 | |
21 | @@ -61,7 +61,7 @@ | |
22 | MY_MYSQL *mysql = NULL; | |
23 | MYSQLI_RESOURCE *mysqli_resource = NULL; | |
24 | zval *object = getThis(); | |
25 | - char *hostname = NULL, *username=NULL, *passwd=NULL, *dbname=NULL, *socket=NULL; | |
26 | + char *hostname = NULL, *username=NULL, *passwd=NULL, *dbname=NULL, *socket=NULL, *connect_charset=NULL; | |
27 | int hostname_len = 0, username_len = 0, passwd_len = 0, dbname_len = 0, socket_len = 0; | |
28 | zend_bool persistent = FALSE; | |
29 | long port = 0, flags = 0; | |
30 | @@ -241,6 +241,12 @@ | |
31 | } | |
32 | #endif | |
33 | ||
34 | + connect_charset = MyG(connect_charset); | |
35 | + | |
36 | + if (connect_charset != NULL) { | |
37 | + mysql_options(mysql->mysql, MYSQL_SET_CHARSET_NAME, connect_charset); | |
38 | + } | |
39 | + | |
40 | #if !defined(MYSQLI_USE_MYSQLND) | |
41 | if (mysql_real_connect(mysql->mysql, hostname, username, passwd, dbname, port, socket, CLIENT_MULTI_RESULTS) == NULL) | |
42 | #else | |
43 | --- php-5.3.1/ext/mysqli/php_mysqli_structs.h~ 2009-10-14 16:51:25.000000000 +0300 | |
44 | +++ php-5.3.1/ext/mysqli/php_mysqli_structs.h 2010-02-20 01:04:56.512214846 +0200 | |
45 | @@ -358,6 +358,7 @@ | |
46 | char *default_user; | |
47 | char *default_socket; | |
48 | char *default_pw; | |
49 | + char *connect_charset; | |
50 | long reconnect; | |
51 | long allow_local_infile; | |
52 | long strict; |