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

diff --git a/openssl.patch b/openssl.patch
index 23920175cdc8f3ff18aeafdc66d7803e7886c779..5edcaebcda8f22c3ebea602d490b3b0830bc27ad 100644 (file)
--- a/openssl.patch
+++ b/openssl.patch
@@ -1020,3 +1020,27 @@ diff -urNp -x '*.orig' php-5.6.40.org/main/streams/php_stream_transport.h php-5.
        STREAM_CRYPTO_METHOD_TLS_ANY_SERVER = ((1 << 3) | (1 << 4) | (1 << 5)),
        STREAM_CRYPTO_METHOD_ANY_SERVER = ((1 << 1) | (1 << 2) | (1 << 3) | (1 << 4) | (1 << 5))
  } php_stream_xport_crypt_method_t;
+--- php-5.6.40/ext/openssl/xp_ssl.c~   2022-03-29 16:13:39.000000000 +0200
++++ php-5.6.40/ext/openssl/xp_ssl.c    2022-03-29 16:16:30.196548935 +0200
+@@ -1242,6 +1242,10 @@
+       }
+ #endif
+ 
++#ifdef SSL_OP_IGNORE_UNEXPECTED_EOF
++      ssl_ctx_options |= SSL_OP_IGNORE_UNEXPECTED_EOF;
++#endif
++
+       if (php_stream_context_get_option(stream->context, "ssl", "dh_param", &val) == SUCCESS) {
+               convert_to_string_ex(val);
+               if (FAILURE == set_server_dh_param(ctx,  Z_STRVAL_PP(val) TSRMLS_CC)) {
+@@ -1489,6 +1493,10 @@
+               return FAILURE;
+       }
+ 
++#ifdef SSL_OP_IGNORE_UNEXPECTED_EOF
++      ssl_ctx_options |= SSL_OP_IGNORE_UNEXPECTED_EOF;
++#endif
++
+ #if OPENSSL_VERSION_NUMBER >= 0x0090806fL
+       if (GET_VER_OPT("no_ticket") && zend_is_true(*val)) {
+               ssl_ctx_options |= SSL_OP_NO_TICKET;

diff --git a/php.spec b/php.spec
index 625356fb91ffa89bc4c3a574df18acee0a1b5609..ff88e795b04229b97b1ff883e7ae26a5f52d12b9 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -155,7 +155,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %undefine      with_filter
 %endif
 
-%define                rel     15
+%define                rel     16
 %define                orgname php
 %define                ver_suffix 56
 %define                php_suffix %{!?with_default_php:%{ver_suffix}}