- updated to 7.0.2, mostly PLD merge, but TLDized (as usual) and with some patches

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

diff --git a/php-mysqli-charsetphpini.patch b/php-mysqli-charsetphpini.patch
index 895a1a7097b39dc2e6b5a1a40360994e17c079b1..29145b7c9f45e0d1866559897c98b61f28c73882 100644 (file)
--- a/php-mysqli-charsetphpini.patch
+++ b/php-mysqli-charsetphpini.patch
@@ -1,14 +1,14 @@
---- 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 @@
+--- php-7.0.1/ext/mysqli/mysqli.c      2015-12-16 10:42:04.000000000 +0000
++++ php-7.0.1/ext/mysqli/mysqli.c      2015-12-28 15:16:20.868443158 +0000
+@@ -522,6 +522,7 @@ PHP_INI_BEGIN()
  #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 @@
+ PHP_INI_END()
+@@ -545,6 +546,7 @@ static PHP_GINIT_FUNCTION(mysqli)
        mysqli_globals->default_user = NULL;
        mysqli_globals->default_pw = NULL;
        mysqli_globals->default_socket = NULL;
@@ -16,18 +16,18 @@
        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 @@
+--- php-7.0.1/ext/mysqli/mysqli_nonapi.c       2015-12-16 10:42:03.000000000 +0000
++++ php-7.0.1/ext/mysqli/mysqli_nonapi.c       2015-12-28 15:23:36.769443158 +0000
+@@ -61,7 +61,7 @@ void mysqli_common_connect(INTERNAL_FUNC
        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;
+       size_t                                  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 @@
+       zend_long                               port = 0, flags = 0;
+@@ -233,6 +233,12 @@ void mysqli_common_connect(INTERNAL_FUNC
        }
  #endif
  
@@ -38,15 +38,15 @@
 +      }
 +
  #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 @@
+       /* BC for prior to bug fix #53425 */
+       flags |= CLIENT_MULTI_RESULTS;
+--- php-7.0.1/ext/mysqli/php_mysqli_structs.h  2015-12-28 15:16:20.870443158 +0000
++++ php-7.0.1/ext/mysqli/php_mysqli_structs.h  2015-12-28 15:23:04.136443158 +0000
+@@ -330,6 +330,7 @@ ZEND_BEGIN_MODULE_GLOBALS(mysqli)
        char                    *default_user;
        char                    *default_socket;
        char                    *default_pw;
 +      char                    *connect_charset;
-       long                    reconnect;
-       long                    allow_local_infile;
-       long                    strict;
+       zend_long                       reconnect;
+       zend_long                       allow_local_infile;
+       zend_long                       strict;