From 740da1cbb9db32d25f249d18bba5bf63bce55721 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= <arekm@maven.pl>
Date: Tue, 29 Mar 2022 14:59:58 +0200
Subject: [PATCH] Up to 7.3.33 and add workaround for
 https://bugs.php.net/bug.php?id=79589

---
 openssl.patch | 26 ++++++++++++++++++++++++++
 php.spec      |  6 +++---
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/openssl.patch b/openssl.patch
index d696980..33f759d 100644
--- a/openssl.patch
+++ b/openssl.patch
@@ -10,3 +10,29 @@
  	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);
  
+diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
+index 5564bf6f08..423f696c76 100644
+--- a/ext/openssl/xp_ssl.c
++++ b/ext/openssl/xp_ssl.c
+@@ -1286,6 +1286,10 @@ static int php_openssl_set_server_specific_opts(php_stream *stream, SSL_CTX *ctx
+ 	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;
+@@ -1628,6 +1632,10 @@ int php_openssl_setup_crypto(php_stream *stream,
+ 	ssl_ctx_options = SSL_OP_ALL;
+ #endif
+ 
++#ifdef SSL_OP_IGNORE_UNEXPECTED_EOF
++	ssl_ctx_options |= SSL_OP_IGNORE_UNEXPECTED_EOF;
++#endif
++
+ 	if (sslsock->ctx == NULL) {
+ 		php_error_docref(NULL, E_WARNING, "SSL context creation failure");
+ 		return FAILURE;
diff --git a/php.spec b/php.spec
index bfda7f2..a748b38 100644
--- a/php.spec
+++ b/php.spec
@@ -156,8 +156,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.3.32
-Release:	2
+Version:	7.3.33
+Release:	1
 Epoch:		4
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
@@ -166,7 +166,7 @@ License:	PHP 3.01 and Zend and BSD
 Group:		Libraries
 #Source0:	https://downloads.php.net/~cmb/php-%{version}%{subver}.tar.xz
 Source0:	https://php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5:	0d497eb02c2d97dac765e05d8df645a7
+# Source0-md5:	eeabb2140c04da85c86389197421f890
 Source1:	opcache.ini
 Source2:	%{orgname}-mod_php.conf
 Source3:	%{orgname}-cgi-fcgi.ini
-- 
2.44.0