- PHP_5_5 branch from PLD, TLDized, updated to 5.5.1

[packages/php.git] / php-mysql-charsetphpini.patch

diff --git a/php-mysql-charsetphpini.patch b/php-mysql-charsetphpini.patch
index cd3e132249dc939d076f5b901ee69e7e62a85db9..37ff15b438741527e7b257188f64bf4d514f5775 100644 (file)
--- a/php-mysql-charsetphpini.patch
+++ b/php-mysql-charsetphpini.patch
@@ -1,5 +1,5 @@
---- php-5.2.5_p20080206.orig/ext/mysql/php_mysql.c     2008-02-06 14:22:57.652600900 +0100
-+++ php-5.2.5_p20080206/ext/mysql/php_mysql.c  2008-02-06 14:24:40.216655403 +0100
+--- 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)
@@ -16,7 +16,7 @@
        mysql_globals->trace_mode = 0;
        mysql_globals->result_allocated = 0;
  }
-@@ -515,6 +517,7 @@
+@@ -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;