commit 717f8a7ff3e86f7814f98e263f3b6c080660a3cd
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Tue Mar 29 16:47:25 2022 +0200
Rel 38. Add workaround for https://bugs.php.net/bug.php?id=79589
openssl.patch | 15 +++++++++++++++
php.spec | 2 +-
2 files changed, 16 insertions(+), 1 deletion(-)
---
diff --git a/php.spec b/php.spec
index c794536..0cd2983 100644
--- a/php.spec
+++ b/php.spec
@@ -112,7 +112,7 @@ ERROR: You need to select at least one Apache SAPI to build
shared modules.
%define magic_mime /usr/share/misc/magic.mime
%endif
-%define rel 37
+%define rel 38
%define orgname php
%define ver_suffix 52
%define php_suffix %{!?with_default_php:%{ver_suffix}}
diff --git a/openssl.patch b/openssl.patch
index 9cbb650..f203bd6 100644
--- a/openssl.patch
+++ b/openssl.patch
@@ -440,3 +440,18 @@ diff -ur php-5.2.17/ext/openssl.org/xp_ssl.c
php-5.2.17/ext/openssl/xp_ssl.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.2.17/ext/openssl/xp_ssl.c~ 2022-03-29 16:34:52.000000000 +0200
++++ php-5.2.17/ext/openssl/xp_ssl.c 2022-03-29 16:36:05.936548953 +0200
+@@ -391,7 +391,11 @@ static inline int php_openssl_setup_cryp
+ return -1;
+ }
+
+- SSL_CTX_set_options(sslsock->ctx, SSL_OP_ALL);
++ SSL_CTX_set_options(sslsock->ctx, SSL_OP_ALL
++#ifdef SSL_OP_IGNORE_UNEXPECTED_EOF
++ | SSL_OP_IGNORE_UNEXPECTED_EOF
++#endif
++ );
+
+ sslsock->ssl_handle = php_SSL_new_from_context(sslsock->ctx, stream
TSRMLS_CC);
+ if (sslsock->ssl_handle == NULL) {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/717f8a7ff3e86f7814f98e263f3b6c080660a3cd
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
