- updated to 7.3.11

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

diff --git a/php-mysqli-charsetphpini.patch b/php-mysqli-charsetphpini.patch
index 29145b7c9f45e0d1866559897c98b61f28c73882..8a22fa319e4eec42fcd2121641797855ec7510a0 100644 (file)
--- a/php-mysqli-charsetphpini.patch
+++ b/php-mysqli-charsetphpini.patch
@@ -18,16 +18,16 @@
        mysqli_globals->report_ht = 0;
 --- 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;
+@@ -56,7 +56,7 @@ void mysqli_common_connect(INTERNAL_FUNC
        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;
-       size_t                                  hostname_len = 0, username_len = 0, passwd_len = 0, dbname_len = 0, socket_len = 0;
-       zend_bool                       persistent = FALSE;
-       zend_long                               port = 0, flags = 0;
-@@ -233,6 +233,12 @@ void mysqli_common_connect(INTERNAL_FUNC
+       char                            *hostname = NULL, *username=NULL, *passwd=NULL, *dbname=NULL, *socket=NULL,
+                                               *ssl_key = NULL, *ssl_cert = NULL, *ssl_ca = NULL, *ssl_capath = NULL,
+-                                              *ssl_cipher = NULL;
++                                              *ssl_cipher = NULL, *connect_charset = NULL;
+       size_t                          hostname_len = 0, username_len = 0, passwd_len = 0, dbname_len = 0, socket_len = 0;
+       zend_bool                       persistent = FALSE, ssl = FALSE;
+       zend_long                       port = 0, flags = 0;
+@@ -257,6 +257,12 @@ void mysqli_common_connect(INTERNAL_FUNC
        }
  #endif