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 /3686.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 '3686.patch')
-rw-r--r-- | 3686.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/3686.patch b/3686.patch new file mode 100644 index 0000000..09226cc --- /dev/null +++ b/3686.patch @@ -0,0 +1,23 @@ +From 3ea5088acb27a4f2f0164b5621c54fb7b8767d47 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Mon, 21 Sep 2020 14:43:55 +0200 +Subject: [PATCH] fix build error: invalid conversion from 'const char*' to + 'char*' + +--- + src/protocol/ssl.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/protocol/ssl.cc b/src/protocol/ssl.cc +index c9069c1a8a..2f48e0ac72 100644 +--- a/src/protocol/ssl.cc ++++ b/src/protocol/ssl.cc +@@ -512,7 +512,7 @@ static int swSSL_check_name(const char *name, ASN1_STRING *pattern) { + char *s, *end; + size_t slen, plen; + +- s = name; ++ s = (char *)name; + slen = strlen(name); + + uchar *p = ASN1_STRING_data(pattern); |