- updated to 7.2.24

diff --git a/php-mysqli-charsetphpini.patch b/php-mysqli-charsetphpini.patch
index 29145b7c9f45e0d1866559897c98b61f28c73882..ecbed608126d71e0c9d519ef690bda0c043ca1a6 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;
+@@ -63,7 +63,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;
+@@ -266,6 +266,12 @@ void mysqli_common_connect(INTERNAL_FUNC
        }
  #endif
  

diff --git a/php.spec b/php.spec
index fc3e694159ac5ca0aed05cc8cdd6f5760206aaea..5f22f56ebe7bd6d1c1c5438e2596d2ced1a26c65 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -146,8 +146,8 @@ Summary(pt_BR.UTF-8):       A linguagem de script PHP
 Summary(ru.UTF-8):     PHP Версии 7 - язык препроцессирования HTML-файлов, выполняемый на сервере
 Summary(uk.UTF-8):     PHP Версії 7 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:          %{orgname}%{php_suffix}
-Version:       7.2.23
-Release:       2
+Version:       7.2.24
+Release:       1
 Epoch:         4
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
@@ -155,7 +155,7 @@ Epoch:              4
 License:       PHP 3.01 and Zend and BSD
 Group:         Libraries
 Source0:       http://php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5: cc1784eb86bb8205fb265303496ef6fa
+# Source0-md5: fc1ef05e9157bd33b3bb93d8822b57b8
 Source1:       opcache.ini
 Source2:       %{orgname}-mod_php.conf
 Source3:       %{orgname}-cgi-fcgi.ini