From 9298bf107a28f799324719497a8f20ee49a1c16e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Tue, 29 Mar 2022 16:01:44 +0200 Subject: [PATCH] Rel 9. Add workaround for https://bugs.php.net/bug.php?id=79589 --- openssl.patch | 24 ++++++++++++++++++++++++ php.spec | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/openssl.patch b/openssl.patch index d609433..af3820f 100644 --- 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 a1f6f9c..2544689 100644 --- 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 -- 2.44.0