[packages/php/PHP_8_0] Up to 8.0.17 and add workaround for https://bugs.php.net/bug.php?id=79589

arekm arekm at pld-linux.org
Tue Mar 29 15:25:39 CEST 2022


commit cb04f936f05878d2a3e8a0b279afac6cdaee81c6
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue Mar 29 15:24:29 2022 +0200

    Up to 8.0.17 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/php.spec b/php.spec
index 5b4c2dd..05e9184 100644
--- a/php.spec
+++ b/php.spec
@@ -147,8 +147,8 @@ Summary(pt_BR.UTF-8):	A linguagem de script PHP
 Summary(ru.UTF-8):	PHP - язык препроцессирования HTML-файлов, выполняемый на сервере
 Summary(uk.UTF-8):	PHP - мова препроцесування HTML-файлів, виконувана на сервері
 Name:		%{orgname}%{php_suffix}
-Version:	8.0.14
-Release:	2
+Version:	8.0.17
+Release:	1
 Epoch:		4
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
@@ -156,7 +156,7 @@ Epoch:		4
 License:	PHP 3.01 and Zend and BSD
 Group:		Libraries
 Source0:	https://php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5:	3a263b6b98ff03fbdf3d9a19bdf93624
+# Source0-md5:	fa88b5f436ad81235b0856144abb0035
 Source1:	opcache.ini
 Source2:	%{orgname}-mod_php.conf
 Source3:	%{orgname}-cgi-fcgi.ini
diff --git a/openssl.patch b/openssl.patch
index a8dabb1..25c11d8 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;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/cb04f936f05878d2a3e8a0b279afac6cdaee81c6



More information about the pld-cvs-commit mailing list