diff options
| author | Remi Collet <remi@remirepo.net> | 2020-10-15 07:50:52 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2020-10-15 07:50:52 +0200 |
| commit | 6e3ef0c458738caf7419171b4bcc25823b55db49 (patch) | |
| tree | 19df0ea12f5617d771f2842772c572a866421d4a /7d4eaed41ae94237ed9e4ae72ac166b6e7617047.patch | |
| parent | 930830304c4a7f05d7f4d4ec25cd83cd44b0eb9b (diff) | |
update to 4.5.5
drop patches merged upstream
Diffstat (limited to '7d4eaed41ae94237ed9e4ae72ac166b6e7617047.patch')
| -rw-r--r-- | 7d4eaed41ae94237ed9e4ae72ac166b6e7617047.patch | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/7d4eaed41ae94237ed9e4ae72ac166b6e7617047.patch b/7d4eaed41ae94237ed9e4ae72ac166b6e7617047.patch deleted file mode 100644 index e05780b..0000000 --- a/7d4eaed41ae94237ed9e4ae72ac166b6e7617047.patch +++ /dev/null @@ -1,25 +0,0 @@ -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(); - } - |