diff options
| author | Eneas U de Queiroz <cote2004-github@yahoo.com> | 2019-05-24 20:51:18 -0300 |
|---|---|---|
| committer | Eneas U de Queiroz <cote2004-github@yahoo.com> | 2019-05-24 21:00:07 -0300 |
| commit | 2d422e1dbb1cb16adc2d27e00248c357bcb9e61e (patch) | |
| tree | b0eb89d03cac7790b076bd7c606cc8915924148c /libs/libevhtp | |
| parent | 93e1a4f5aea2294247b15a41b5a977721bfa670f (diff) | |
libevhtp: restore openssl-thread patch
The first and last hunks of the patch were already taken care of, but
the middle two were still needed.
Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
Diffstat (limited to 'libs/libevhtp')
| -rw-r--r-- | libs/libevhtp/patches/010-openssl-thread.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/libs/libevhtp/patches/010-openssl-thread.patch b/libs/libevhtp/patches/010-openssl-thread.patch new file mode 100644 index 000000000..4dea38c7f --- /dev/null +++ b/libs/libevhtp/patches/010-openssl-thread.patch @@ -0,0 +1,29 @@ +--- a/evhtp.c ++++ b/evhtp.c +@@ -2863,7 +2863,7 @@ htp__accept_cb_(struct evconnlistener * serv, int fd, struct sockaddr * s, int s + } /* htp__accept_cb_ */ + + #ifndef EVHTP_DISABLE_SSL +-#ifndef EVHTP_DISABLE_EVTHR ++#if !defined(EVHTP_DISABLE_EVTHR) && (OPENSSL_VERSION_NUMBER < 0x10100000L) + + #ifndef WIN32 + #define _HTP_tid (unsigned long)pthread_self() +@@ -4575,7 +4575,7 @@ htp__use_threads_(evhtp_t * htp, + htp->thread_init_cb = init_cb; + htp->thread_exit_cb = exit_cb; + +-#ifndef EVHTP_DISABLE_SSL ++#if !defined(EVHTP_DISABLE_EVTHR) && (OPENSSL_VERSION_NUMBER < 0x10100000L) + evhtp_ssl_use_threads(); + #endif + +@@ -4723,7 +4723,7 @@ evhtp_set_post_accept_cb(evhtp_t * htp, evhtp_post_accept_cb cb, void * arg) + } + + #ifndef EVHTP_DISABLE_SSL +-#ifndef EVHTP_DISABLE_EVTHR ++#if !defined(EVHTP_DISABLE_EVTHR) && (OPENSSL_VERSION_NUMBER < 0x10100000L) + int + evhtp_ssl_use_threads(void) + { |