php-mysqli-charsetphpini.patch

   1 --- ext/mysqli/mysqli_api.c     2006-12-01 16:30:36.000000000 +0100
   2 +++ ext/mysqli/mysqli_api.c     2006-12-01 16:39:32.000000000 +0100
   3 @@ -1395,7 +1395,7 @@
   4  PHP_FUNCTION(mysqli_real_connect)
   5  {
   6         MY_MYSQL                *mysql;
   7 -       char                    *hostname = NULL, *username=NULL, *passwd=NULL, *dbname=NULL, *socket=NULL;
   8 +       char                    *hostname = NULL, *username=NULL, *passwd=NULL, *dbname=NULL, *socket=NULL, *connect_charset=NULL;
   9         unsigned int    hostname_len = 0, username_len = 0, passwd_len = 0, dbname_len = 0, socket_len = 0;
  10         unsigned long   port=0, flags=0;
  11         zval                    *mysql_link;
  12 @@ -1436,6 +1436,12 @@
  13                 socket = MyG(default_socket);
  14         }
  15
  16 +       connect_charset = MyG(connect_charset);
  17 +
  18 +       if (connect_charset != NULL) {
  19 +               mysql_options(mysql->mysql, MYSQL_SET_CHARSET_NAME, connect_charset);
  20 +       }
  21 +
  22         if (mysql_real_connect(mysql->mysql,hostname,username,passwd,dbname,port,socket,flags) == NULL) {
  23                 php_mysqli_set_error(mysql_errno(mysql->mysql), (char *) mysql_error(mysql->mysql) TSRMLS_CC);
  24                 php_mysqli_throw_sql_exception( mysql->mysql->net.sqlstate, mysql->mysql->net.last_errno TSRMLS_CC,
  25 --- ext/mysqli/mysqli.c 2006-12-01 16:30:36.000000000 +0100
  26 +++ ext/mysqli/mysqli.c 2006-12-01 16:38:01.000000000 +0100
  27 @@ -459,6 +459,7 @@
  28         STD_PHP_INI_ENTRY("mysqli.default_pw",                          NULL,   PHP_INI_ALL,            OnUpdateString,         default_pw,                     zend_mysqli_globals,            mysqli_globals)
  29         STD_PHP_INI_ENTRY("mysqli.default_port",                        "3306", PHP_INI_ALL,            OnUpdateLong,           default_port,           zend_mysqli_globals,            mysqli_globals)
  30         STD_PHP_INI_ENTRY("mysqli.default_socket",                      NULL,   PHP_INI_ALL,            OnUpdateStringUnempty,  default_socket, zend_mysqli_globals,            mysqli_globals)
  31 +       STD_PHP_INI_ENTRY("mysqli.connect_charset",                     NULL,   PHP_INI_ALL,            OnUpdateString,         connect_charset,        zend_mysqli_globals,            mysqli_globals)
  32         STD_PHP_INI_BOOLEAN("mysqli.reconnect",                         "0",    PHP_INI_SYSTEM,         OnUpdateLong,           reconnect,                      zend_mysqli_globals,            mysqli_globals)
  33  PHP_INI_END()
  34
  35 @@ -475,6 +476,7 @@
  36         mysqli_globals->default_user = NULL;
  37         mysqli_globals->default_pw = NULL;
  38         mysqli_globals->default_socket = NULL;
  39 +       mysqli_globals->connect_charset = NULL;
  40         mysqli_globals->reconnect = 0;
  41         mysqli_globals->report_mode = 0;
  42         mysqli_globals->report_ht = 0;
  43 --- ext/mysqli/mysqli_nonapi.c  2006-12-01 16:30:36.000000000 +0100
  44 +++ ext/mysqli/mysqli_nonapi.c  2006-12-01 16:40:29.000000000 +0100
  45 @@ -36,7 +36,7 @@
  46         MY_MYSQL                        *mysql;
  47         MYSQLI_RESOURCE         *mysqli_resource;
  48         zval                            *object = getThis();
  49 -       char                            *hostname = NULL, *username=NULL, *passwd=NULL, *dbname=NULL, *socket=NULL;
  50 +       char                            *hostname = NULL, *username=NULL, *passwd=NULL, *dbname=NULL, *socket=NULL, *connect_charset=NULL;
  51         unsigned int            hostname_len = 0, username_len = 0, passwd_len = 0, dbname_len = 0, socket_len = 0;
  52         long                            port=0;
  53
  54 @@ -88,6 +88,12 @@
  55                 socket = MyG(default_socket);
  56         }
  57
  58 +       connect_charset = MyG(connect_charset);
  59 +
  60 +       if (connect_charset != NULL) {
  61 +               mysql_options(mysql->mysql, MYSQL_SET_CHARSET_NAME, connect_charset);
  62 +       }
  63 +
  64         if (mysql_real_connect(mysql->mysql,hostname,username,passwd,dbname,port,socket,CLIENT_MULTI_RESULTS) == NULL) {
  65                 /* Save error messages */
  66
  67 --- ext/mysqli/php_mysqli.h     2006-12-01 16:30:36.000000000 +0100
  68 +++ ext/mysqli/php_mysqli.h     2006-12-01 16:36:23.000000000 +0100
  69 @@ -433,6 +433,7 @@
  70         char                    *default_user;
  71         char                    *default_socket;
  72         char            *default_pw;
  73 +       char                    *connect_charset;
  74         int                             reconnect;
  75         int                             strict;
  76         long                    error_no;