php-mysqli-charsetphpini.patch

   1 --- php-7.0.1/ext/mysqli/mysqli.c       2015-12-16 10:42:04.000000000 +0000
   2 +++ php-7.0.1/ext/mysqli/mysqli.c       2015-12-28 15:16:20.868443158 +0000
   3 @@ -522,6 +522,7 @@ PHP_INI_BEGIN()
   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  PHP_INI_END()
  11 @@ -545,6 +546,7 @@ static PHP_GINIT_FUNCTION(mysqli)
  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-7.0.1/ext/mysqli/mysqli_nonapi.c        2015-12-16 10:42:03.000000000 +0000
  20 +++ php-7.0.1/ext/mysqli/mysqli_nonapi.c        2015-12-28 15:23:36.769443158 +0000
  21 @@ -61,7 +61,7 @@ void mysqli_common_connect(INTERNAL_FUNC
  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         size_t                                  hostname_len = 0, username_len = 0, passwd_len = 0, dbname_len = 0, socket_len = 0;
  28         zend_bool                       persistent = FALSE;
  29         zend_long                               port = 0, flags = 0;
  30 @@ -233,6 +233,12 @@ void mysqli_common_connect(INTERNAL_FUNC
  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         /* BC for prior to bug fix #53425 */
  42         flags |= CLIENT_MULTI_RESULTS;
  43 --- php-7.0.1/ext/mysqli/php_mysqli_structs.h   2015-12-28 15:16:20.870443158 +0000
  44 +++ php-7.0.1/ext/mysqli/php_mysqli_structs.h   2015-12-28 15:23:04.136443158 +0000
  45 @@ -330,6 +330,7 @@ ZEND_BEGIN_MODULE_GLOBALS(mysqli)
  46         char                    *default_user;
  47         char                    *default_socket;
  48         char                    *default_pw;
  49 +       char                    *connect_charset;
  50         zend_long                       reconnect;
  51         zend_long                       allow_local_infile;
  52         zend_long                       strict;