commit 4f8ab6df1f73bd533aba696fee46a80831b2f006
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Tue Mar 29 17:38:29 2022 +0200
Rel 59; proper version of workaround
openssl.patch | 18 ++++++++++--------
php.spec | 2 +-
2 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/php.spec b/php.spec
index 1d73e8b..4de1d50 100644
--- a/php.spec
+++ b/php.spec
@@ -143,7 +143,7 @@ ERROR: You need to select at least one Apache SAPI to build
shared modules.
%undefine with_alternatives
%endif
-%define rel 58
+%define rel 59
%define orgname php
%define ver_suffix 53
%define php_suffix %{!?with_default_php:%{ver_suffix}}
diff --git a/openssl.patch b/openssl.patch
index 11d44f9..e9d5eb7 100644
--- a/openssl.patch
+++ b/openssl.patch
@@ -1030,16 +1030,18 @@ diff -ruNp php-5.3.29.orig/ext/openssl/xp_ssl.c
php-5.3.29/ext/openssl/xp_ssl.c
} else if (strncmp(proto, "tls", protolen) == 0) {
sslsock->enable_on_connect = 1;
sslsock->method = STREAM_CRYPTO_METHOD_TLS_CLIENT;
---- 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
- }
+--- php-5.3.29/ext/openssl/xp_ssl.c~ 2022-03-29 17:28:18.000000000 +0200
++++ php-5.3.29/ext/openssl/xp_ssl.c 2022-03-29 17:31:01.756549079 +0200
+@@ -387,7 +387,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_ctx_options |= SSL_OP_IGNORE_UNEXPECTED_EOF;
++ | SSL_OP_IGNORE_UNEXPECTED_EOF
+#endif
-+
- /* need to do slightly different things, based on client/server method,
- * so lets remember which method was selected */
++ );
+ #if OPENSSL_VERSION_NUMBER >= 0x0090806fL
+ {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/4f8ab6df1f73bd533aba696fee46a80831b2f006
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
