com php-src: add mysql.default_charset: ext/mysql/php _mysql.c ext/mysql/php_mysql_structs.h

From: Date: Thu, 12 Dec 2013 08:47:41 +0000
Subject: com php-src: add mysql.default_charset: ext/mysql/php _mysql.c ext/mysql/php_mysql_structs.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-76646@lists.php.net to get a copy of this message
Commit: e379a4fb319d1a4c281bb8cb8fa54f88f22ddafa Author: Antony Dovgal <tony@daylessday.org> Sat, 31 Dec 2011 00:52:05 +0400 Committer: Antony Dovgal <tony2001@php.net> Thu, 12 Dec 2013 12:47:41 +0400 Parents: 4fd7f5833ca297098c33bacd01dcd81f3e780f0f Branches: badoo-5..5_mysqlnd Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e379a4fb319d1a4c281bb8cb8fa54f88f22ddafa Log: add mysql.default_charset Changed paths: M ext/mysql/php_mysql.c M ext/mysql/php_mysql_structs.h Diff: diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index 46a5e9e..344ad6a 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -505,6 +505,7 @@ PHP_INI_BEGIN() #else STD_PHP_INI_ENTRY("mysql.default_socket", NULL, PHP_INI_ALL, OnUpdateStringUnempty, default_socket, zend_mysql_globals, mysql_globals) #endif + STD_PHP_INI_ENTRY("mysql.default_charset", NULL, PHP_INI_ALL, OnUpdateString, default_charset, zend_mysql_globals, mysql_globals) STD_PHP_INI_ENTRY("mysql.connect_timeout", "60", PHP_INI_ALL, OnUpdateLong, connect_timeout, zend_mysql_globals, mysql_globals) STD_PHP_INI_BOOLEAN("mysql.trace_mode", "0", PHP_INI_ALL, OnUpdateLong, trace_mode, zend_mysql_globals, mysql_globals) STD_PHP_INI_BOOLEAN("mysql.allow_local_infile", "1", PHP_INI_SYSTEM, OnUpdateLong, allow_local_infile, zend_mysql_globals, mysql_globals) @@ -520,6 +521,7 @@ static PHP_GINIT_FUNCTION(mysql) mysql_globals->default_host = NULL; mysql_globals->default_user = NULL; mysql_globals->default_password = NULL; + mysql_globals->default_charset = NULL; mysql_globals->connect_errno = 0; mysql_globals->connect_error = NULL; mysql_globals->connect_timeout = 0; @@ -884,6 +886,11 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) if (connect_timeout != -1) { mysql_options(mysql->conn, MYSQL_OPT_CONNECT_TIMEOUT, (const char *)&connect_timeout); } + + if (MySG(default_charset) != NULL) { + mysql_options(mysql->conn, MYSQL_SET_CHARSET_NAME, (const char *) MySG(default_charset)); + } + #ifndef MYSQL_USE_MYSQLND if (mysql_real_connect(mysql->conn, host, user, passwd, NULL, port, socket, client_flags)==NULL) #else @@ -1009,6 +1016,10 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) mysql->multi_query = 1; #endif + if (MySG(default_charset) != NULL) { + mysql_options(mysql->conn, MYSQL_SET_CHARSET_NAME, (const char *) MySG(default_charset)); + } + #ifndef MYSQL_USE_MYSQLND mysql->conn = mysql_init(NULL); #else diff --git a/ext/mysql/php_mysql_structs.h b/ext/mysql/php_mysql_structs.h index bf09b24..d494e90 100644 --- a/ext/mysql/php_mysql_structs.h +++ b/ext/mysql/php_mysql_structs.h @@ -119,6 +119,7 @@ ZEND_BEGIN_MODULE_GLOBALS(mysql) char *default_host, *default_user, *default_password; char *default_socket; char *connect_error; + char *default_charset; long connect_errno; long connect_timeout; long result_allocated;

« previous php.cvs (#76646) next »