Rel 6; add workaround to https://bugs.php.net/bug.php?id=79589

diff --git a/openssl.patch b/openssl.patch
index d69698071c0e9bce0b4eaeeee0359f6c84752b20..ec9386602045e5608190d3ab7f3f9afd47a18246 100644 (file)
--- a/openssl.patch
+++ b/openssl.patch
@@ -10,3 +10,27 @@
        REGISTER_LONG_CONSTANT("OPENSSL_NO_PADDING", RSA_NO_PADDING, CONST_CS|CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("OPENSSL_PKCS1_OAEP_PADDING", RSA_PKCS1_OAEP_PADDING, CONST_CS|CONST_PERSISTENT);
  
+--- 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 (php_openssl_set_server_ecdh_curve(stream, ctx) == FAILURE) {
+               return FAILURE;

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