Rel 9. Add workaround for https://bugs.php.net/bug.php?id=79589

diff --git a/openssl.patch b/openssl.patch
index d6094331075f6c105483623c09eca097d9901cb7..af3820f7bfef028015ba688c0af707d7c87c0126 100644 (file)
--- a/openssl.patch
+++ b/openssl.patch
@@ -57,3 +57,27 @@ diff -urNp -x '*.orig' php-7.1.33.org/main/streams/php_stream_transport.h php-7.
        STREAM_CRYPTO_METHOD_TLS_ANY_SERVER = ((1 << 3) | (1 << 4) | (1 << 5)),
        STREAM_CRYPTO_METHOD_ANY_SERVER = ((1 << 1) | (1 << 2) | (1 << 3) | (1 << 4) | (1 << 5))
  } php_stream_xport_crypt_method_t;
+--- php-7.2.34/ext/openssl/xp_ssl.c.orig       2020-09-30 07:15:53.000000000 +0200
++++ php-7.2.34/ext/openssl/xp_ssl.c    2022-03-29 15:28:35.726548949 +0200
+@@ -1014,6 +1014,10 @@ static int php_openssl_get_crypto_method
+ {
+       int ssl_ctx_options = SSL_OP_ALL;
+ 
++#ifdef SSL_OP_IGNORE_UNEXPECTED_EOF
++      ssl_ctx_options |= SSL_OP_IGNORE_UNEXPECTED_EOF;
++#endif
++
+ #ifdef SSL_OP_NO_SSLv2
+       ssl_ctx_options |= SSL_OP_NO_SSLv2;
+ #endif
+@@ -1261,6 +1265,10 @@ static int php_openssl_set_server_specif
+       zval *zv;
+       long ssl_ctx_options = SSL_CTX_get_options(ctx);
+ 
++#ifdef SSL_OP_IGNORE_UNEXPECTED_EOF
++      ssl_ctx_options |= SSL_OP_IGNORE_UNEXPECTED_EOF;
++#endif
++
+ #if defined(HAVE_ECDH) && PHP_OPENSSL_API_VERSION < 0x10100
+       if (set_server_ecdh_curve(stream, ctx) == FAILURE) {
+               return FAILURE;

diff --git a/php.spec b/php.spec
index a1f6f9c7029d364a967ae1fd9cfbe98cdc2de5cf..2544689e71a905cf22e6bfd64ab66e376eb653c1 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -151,7 +151,7 @@ Summary(ru.UTF-8):  PHP Версии 7 - язык препроцессирова
 Summary(uk.UTF-8):     PHP Версії 7 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:          %{orgname}%{php_suffix}
 Version:       7.1.33
-Release:       8
+Release:       9
 Epoch:         4
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend