+++ /dev/null
---- php-5.5.0RC2/ext/mysql/php_mysql.c~ 2013-06-11 22:12:11.000000000 +0300
-+++ php-5.5.0RC2/ext/mysql/php_mysql.c 2013-06-11 22:16:04.192270533 +0300
-@@ -360,6 +360,7 @@
- PHP_INI_ENTRY("mysql.default_port", NULL, PHP_INI_ALL, OnMySQLPort)
- STD_PHP_INI_ENTRY("mysql.default_socket", NULL, PHP_INI_ALL, OnUpdateStringUnempty, default_socket, 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_ENTRY("mysql.connect_charset", NULL, PHP_INI_ALL, OnUpdateString, connect_charset, zend_mysql_globals, mysql_globals)
- STD_PHP_INI_BOOLEAN("mysql.trace_mode", "0", PHP_INI_ALL, OnUpdateLong, trace_mode, zend_mysql_globals, mysql_globals)
- PHP_INI_END()
- /* }}} */
-@@ -376,6 +377,7 @@
- mysql_globals->connect_errno = 0;
- mysql_globals->connect_error = NULL;
- mysql_globals->connect_timeout = 0;
-+ mysql_globals->connect_charset = NULL;
- mysql_globals->trace_mode = 0;
- mysql_globals->result_allocated = 0;
- }
-@@ -723,6 +723,7 @@
- {
- char *user=NULL, *passwd=NULL, *host_and_port=NULL, *socket=NULL, *tmp=NULL, *host=NULL;
- int user_len = 0, passwd_len = 0, host_len = 0;
-+ char *connect_charset=NULL;
- char *hashed_details=NULL;
- int hashed_details_length, port = MYSQL_PORT;
- long client_flags = 0;
-@@ -527,6 +530,7 @@
-
-
- connect_timeout = MySG(connect_timeout);
-+ connect_charset = MySG(connect_charset);
-
- socket = MySG(default_socket);
-
---- php-5.3.1/ext/mysql/php_mysql.c~ 2010-02-20 00:51:52.000000000 +0200
-+++ php-5.3.1/ext/mysql/php_mysql.c 2010-02-20 00:55:43.475653264 +0200
-@@ -777,6 +777,10 @@
- if (connect_timeout != -1) {
- mysql_options(mysql->conn, MYSQL_OPT_CONNECT_TIMEOUT, (const char *)&connect_timeout);
- }
-+
-+ if (connect_charset != NULL)
-+ mysql_options(mysql->conn, MYSQL_SET_CHARSET_NAME, connect_charset);
-+
- #ifndef MYSQL_USE_MYSQLND
- if (mysql_real_connect(mysql->conn, host, user, passwd, NULL, port, socket, client_flags)==NULL)
- #else
-@@ -826,6 +830,8 @@
- #endif
- if (mysql_ping(mysql->conn)) {
- if (mysql_errno(mysql->conn) == 2006) {
-+ if (connect_charset != NULL)
-+ mysql_options(mysql->conn, MYSQL_SET_CHARSET_NAME, connect_charset);
- #ifndef MYSQL_USE_MYSQLND
- if (mysql_real_connect(mysql->conn, host, user, passwd, NULL, port, socket, client_flags)==NULL)
- #else
-@@ -898,6 +904,9 @@
- if (connect_timeout != -1)
- mysql_options(mysql->conn, MYSQL_OPT_CONNECT_TIMEOUT, (const char *)&connect_timeout);
-
-+ if (connect_charset != NULL)
-+ mysql_options(mysql->conn, MYSQL_SET_CHARSET_NAME, connect_charset);
-+
- #ifndef MYSQL_USE_MYSQLND
- if (mysql_real_connect(mysql->conn, host, user, passwd, NULL, port, socket, client_flags)==NULL)
- #else
---- php-5.2.5_p20080206.orig/ext/mysql/php_mysql_structs.h 2008-02-06 14:22:57.510605687 +0100
-+++ php-5.2.5_p20080206/ext/mysql/php_mysql_structs.h 2008-02-06 14:23:27.764590355 +0100
-@@ -103,6 +103,7 @@
- long default_port;
- char *default_host, *default_user, *default_password;
- char *default_socket;
-+ char *connect_charset;
- char *connect_error;
- long connect_errno;
- long connect_timeout;
+++ /dev/null
---- php-5.3.1/ext/mysqli/mysqli.c~ 2010-02-20 00:58:34.000000000 +0200
-+++ php-5.3.1/ext/mysqli/mysqli.c 2010-02-20 01:00:22.459111311 +0200
-@@ -602,6 +602,7 @@
- #else
- STD_PHP_INI_ENTRY("mysqli.default_socket", NULL, PHP_INI_ALL, OnUpdateStringUnempty, default_socket, zend_mysqli_globals, mysqli_globals)
- #endif
-+ STD_PHP_INI_ENTRY("mysqli.connect_charset", NULL, PHP_INI_ALL, OnUpdateString, connect_charset, zend_mysqli_globals, mysqli_globals)
- STD_PHP_INI_BOOLEAN("mysqli.reconnect", "0", PHP_INI_SYSTEM, OnUpdateLong, reconnect, zend_mysqli_globals, mysqli_globals)
- STD_PHP_INI_BOOLEAN("mysqli.allow_local_infile", "1", PHP_INI_SYSTEM, OnUpdateLong, allow_local_infile, zend_mysqli_globals, mysqli_globals)
- #ifdef MYSQLI_USE_MYSQLND
-@@ -475,6 +476,7 @@
- mysqli_globals->default_user = NULL;
- mysqli_globals->default_pw = NULL;
- mysqli_globals->default_socket = NULL;
-+ mysqli_globals->connect_charset = NULL;
- mysqli_globals->reconnect = 0;
- mysqli_globals->report_mode = 0;
- mysqli_globals->report_ht = 0;
---- php-5.3.4/ext/mysqli/mysqli_nonapi.c~ 2010-12-12 23:07:03.000000000 +0200
-+++ php-5.3.4/ext/mysqli/mysqli_nonapi.c 2010-12-12 23:07:36.497424912 +0200
-@@ -61,7 +61,7 @@
- MY_MYSQL *mysql = NULL;
- MYSQLI_RESOURCE *mysqli_resource = NULL;
- zval *object = getThis();
-- char *hostname = NULL, *username=NULL, *passwd=NULL, *dbname=NULL, *socket=NULL;
-+ char *hostname = NULL, *username=NULL, *passwd=NULL, *dbname=NULL, *socket=NULL, *connect_charset=NULL;
- int hostname_len = 0, username_len = 0, passwd_len = 0, dbname_len = 0, socket_len = 0;
- zend_bool persistent = FALSE;
- long port = 0, flags = 0;
-@@ -241,6 +241,12 @@
- }
- #endif
-
-+ connect_charset = MyG(connect_charset);
-+
-+ if (connect_charset != NULL) {
-+ mysql_options(mysql->mysql, MYSQL_SET_CHARSET_NAME, connect_charset);
-+ }
-+
- #if !defined(MYSQLI_USE_MYSQLND)
- if (mysql_real_connect(mysql->mysql, hostname, username, passwd, dbname, port, socket, CLIENT_MULTI_RESULTS) == NULL)
- #else
---- php-5.3.1/ext/mysqli/php_mysqli_structs.h~ 2009-10-14 16:51:25.000000000 +0300
-+++ php-5.3.1/ext/mysqli/php_mysqli_structs.h 2010-02-20 01:04:56.512214846 +0200
-@@ -358,6 +358,7 @@
- char *default_user;
- char *default_socket;
- char *default_pw;
-+ char *connect_charset;
- long reconnect;
- long allow_local_infile;
- long strict;
+++ /dev/null
-This is damn ugly patch if you need to update it, see PHP_5_2 branch version to
-understand what this patch is supposed to do as in 5.3 the ini section is
-enabled only if mysqlnd driver is enabled which makes the contexts really
-small.
-
---- php-5.3.1/ext/pdo_mysql/mysql_driver.c~ 2010-02-20 01:08:04.000000000 +0200
-+++ php-5.3.1/ext/pdo_mysql/mysql_driver.c 2010-02-20 01:08:52.982186037 +0200
-@@ -436,6 +436,7 @@
- pdo_mysql_db_handle *H;
- int i, ret = 0;
- char *host = NULL, *unix_socket = NULL;
-+ char *connect_charset = NULL;
- unsigned int port = 3306;
- char *dbname;
- struct pdo_data_src_parser vars[] = {
-@@ -731,6 +731,12 @@
- password_len = strlen(dbh->password);
- }
-
-+ connect_charset = PDO_MYSQL_G(connect_charset);
-+
-+ if (connect_charset != NULL) {
-+ mysql_options(H->server, MYSQL_SET_CHARSET_NAME, connect_charset);
-+ }
-+
- if (mysqlnd_connect(H->server, host, dbh->username, dbh->password, password_len, dbname, dbname_len,
- port, unix_socket, connect_opts, PDO_MYSQL_G(mysqlnd_thd_zval_cache) TSRMLS_CC) == NULL) {
- #else
---- php-5.3.3/ext/pdo_mysql/pdo_mysql.c~ 2010-07-24 19:23:14.000000000 +0300
-+++ php-5.3.3/ext/pdo_mysql/pdo_mysql.c 2010-07-24 19:24:48.363581841 +0300
-@@ -56,6 +56,7 @@
- #if PDO_DBG_ENABLED
- STD_PHP_INI_ENTRY("pdo_mysql.debug", NULL, PHP_INI_SYSTEM, OnUpdateString, debug, zend_pdo_mysql_globals, pdo_mysql_globals)
- #endif
-+ STD_PHP_INI_ENTRY("pdo_mysql.connect_charset", NULL, PHP_INI_ALL, OnUpdateString, connect_charset, zend_pdo_mysql_globals, pdo_mysql_globals)
- PHP_INI_END()
- /* }}} */
-
-@@ -89,9 +90,7 @@
- static PHP_MSHUTDOWN_FUNCTION(pdo_mysql)
- {
- php_pdo_unregister_driver(&pdo_mysql_driver);
--#if PDO_USE_MYSQLND
- UNREGISTER_INI_ENTRIES();
--#endif
-
- return SUCCESS;
- }
-@@ -161,6 +161,7 @@
- pdo_mysql_globals->debug = NULL; /* The actual string */
- pdo_mysql_globals->dbg = NULL; /* The DBG object*/
- #endif
-+ pdo_mysql_globals->connect_charset = NULL;
- }
- /* }}} */
-
---- php-5.3.2RC3/ext/pdo_mysql/php_pdo_mysql_int.h~ 2010-02-04 11:37:38.000000000 +0200
-+++ php-5.3.2RC3/ext/pdo_mysql/php_pdo_mysql_int.h 2010-02-26 19:11:47.484055898 +0200
-@@ -69,6 +69,7 @@
- char *debug; /* The actual string */
- MYSQLND_DEBUG *dbg; /* The DBG object */
- #endif
-+ char *connect_charset;
- #if defined(PHP_WIN32) && !PDO_DBG_ENABLED
- /* dummy member so we get at least one member in the struct
- * and avoids build errors.
Patch29: %{orgname}-fcgi-graceful.patch
Patch31: %{orgname}-fcgi-error_log-no-newlines.patch
Patch34: %{orgname}-libtool.patch
-#Patch36: %{orgname}-mysql-charsetphpini.patch
-#Patch37: %{orgname}-mysqli-charsetphpini.patch
-#Patch38: %{orgname}-pdo_mysql-charsetphpini.patch
Patch39: %{orgname}-use-prog_sendmail.patch
Patch41: %{orgname}-fpm-config.patch
Patch42: %{orgname}-fpm-shared.patch
%if "%{pld_release}" != "ac"
%patch34 -p1
%endif
-#%patch36 -p1
-#%patch37 -p1
-#%patch38 -p1
%patch39 -p1
%patch41 -p1
%patch42 -p1
projects / packages / php.git / commitdiff