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

diff --git a/openssl.patch b/openssl.patch
index d69698071c0e9bce0b4eaeeee0359f6c84752b20..a1c87bc073f7030e230bf9bfb836a86b5c6a8aca 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.0.33/ext/openssl/xp_ssl.c~   2018-12-04 18:22:59.000000000 +0100
++++ php-7.0.33/ext/openssl/xp_ssl.c    2022-03-29 16:07:39.443215599 +0200
+@@ -1268,6 +1268,10 @@ static int set_server_specific_opts(php_
+       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) && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER))
+       if (set_server_ecdh_curve(stream, ctx) == FAILURE) {
+               return FAILURE;
+@@ -1558,6 +1562,10 @@ int php_openssl_setup_crypto(php_stream
+               return FAILURE;
+       }
+ 
++#ifdef SSL_OP_IGNORE_UNEXPECTED_EOF
++      ssl_ctx_options |= SSL_OP_IGNORE_UNEXPECTED_EOF;
++#endif
++
+ #if OPENSSL_VERSION_NUMBER >= 0x0090806fL
+       if (GET_VER_OPT("no_ticket") && zend_is_true(val)) {
+               ssl_ctx_options |= SSL_OP_NO_TICKET;

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