diff options
| author | Remi Collet <remi@remirepo.net> | 2020-09-21 14:50:50 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2020-09-21 14:50:50 +0200 |
| commit | b087aa85ee6ab8173614ac9d30fa30990c1cb93d (patch) | |
| tree | e3405f8251d1f8caf5b1c6d1b6159e36b48316db /7d4eaed41ae94237ed9e4ae72ac166b6e7617047.patch | |
| parent | 818b239361ce36fbe146ece5576406cc14fdb32c (diff) | |
add upstream patch for EL-6 and for PHP 8
add patch for EL-6 from
https://github.com/swoole/swoole-src/pull/3686
Diffstat (limited to '7d4eaed41ae94237ed9e4ae72ac166b6e7617047.patch')
| -rw-r--r-- | 7d4eaed41ae94237ed9e4ae72ac166b6e7617047.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/7d4eaed41ae94237ed9e4ae72ac166b6e7617047.patch b/7d4eaed41ae94237ed9e4ae72ac166b6e7617047.patch new file mode 100644 index 0000000..e05780b --- /dev/null +++ b/7d4eaed41ae94237ed9e4ae72ac166b6e7617047.patch @@ -0,0 +1,25 @@ +From 7d4eaed41ae94237ed9e4ae72ac166b6e7617047 Mon Sep 17 00:00:00 2001 +From: Yurun <admin@yurunsoft.com> +Date: Sun, 20 Sep 2020 14:43:03 +0800 +Subject: [PATCH] Fix #3681 (#3682) + +--- + src/protocol/ssl.cc | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/protocol/ssl.cc b/src/protocol/ssl.cc +index 61a3e56c0e..c9069c1a8a 100644 +--- a/src/protocol/ssl.cc ++++ b/src/protocol/ssl.cc +@@ -71,9 +71,11 @@ static int swSSL_verify_cookie(SSL *ssl, const uchar *cookie, uint cookie_len); + static void MAYBE_UNUSED swSSL_lock_callback(int mode, int type, const char *file, int line); + + static const SSL_METHOD *swSSL_get_method(swSSL_option *option) { ++#ifdef SW_SUPPORT_DTLS + if (option->protocols & SW_SSL_DTLS) { + return DTLS_method(); + } ++#endif + return SSLv23_method(); + } + |