From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Tue, 29 Mar 2022 14:32:13 +0000 (+0200)
Subject: Rel 36. Add workaround for https://bugs.php.net/bug.php?id=79589
X-Git-Tag: auto/th/php54-5.4.45-36
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=9f2cde1ab51cbffadb09199336727936f8e6a38b;p=packages%2Fphp.git

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

diff --git a/openssl.patch b/openssl.patch
index a3efe50..6088228 100644
--- a/openssl.patch
+++ b/openssl.patch
@@ -1016,3 +1016,16 @@ diff -ur php-5.4.45/ext/openssl.org/openssl.c php-5.4.45/ext/openssl/openssl.c
  	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-5.5.38/ext/openssl/xp_ssl.c~	2022-03-29 16:25:01.000000000 +0200
++++ php-5.5.38/ext/openssl/xp_ssl.c	2022-03-29 16:27:12.643215607 +0200
+@@ -445,6 +445,10 @@ static inline int php_openssl_setup_cryp
+ 		}
+ 	}
+ 
++#ifdef SSL_OP_IGNORE_UNEXPECTED_EOF
++	ssl_ctx_options |= SSL_OP_IGNORE_UNEXPECTED_EOF;
++#endif
++
+ 	/* need to do slightly different things, based on client/server method,
+ 	 * so lets remember which method was selected */
+ 
diff --git a/php.spec b/php.spec
index db0f377..fe50e69 100644
--- a/php.spec
+++ b/php.spec
@@ -138,7 +138,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %undefine	with_filter
 %endif
 
-%define		rel	35
+%define		rel	36
 %define		orgname	php
 %define		ver_suffix 54
 %define		php_suffix %{!?with_default_php:%{ver_suffix}}