mirror of
https://github.com/openresty/openresty
synced 2024-11-09 18:35:51 +01:00
08e9e50782
This reverts commit 9e834398de906bea23c8668bd8d78c36c453224a. Support for OpenSSL 1.1.1 will come with the 1.17.1 series of NGINX patches. Since no other 1.15.8.* releases are planned, we are reverting the state of the 1.15.8 patches to that of the 1.15.8.1 release.
17 lines
609 B
C
17 lines
609 B
C
--- nginx-1.15.8/src/event/ngx_event_openssl.c 2016-07-17 19:20:30.411137606 -0700
|
|
+++ nginx-1.15.8-patched/src/event/ngx_event_openssl.c 2016-07-19 16:53:35.539768477 -0700
|
|
@@ -1307,7 +1307,12 @@ ngx_ssl_handshake(ngx_connection_t *c)
|
|
}
|
|
|
|
#if OPENSSL_VERSION_NUMBER >= 0x10002000L
|
|
- if (sslerr == SSL_ERROR_WANT_X509_LOOKUP) {
|
|
+ if (sslerr == SSL_ERROR_WANT_X509_LOOKUP
|
|
+# ifdef SSL_ERROR_PENDING_SESSION
|
|
+ || sslerr == SSL_ERROR_PENDING_SESSION
|
|
+# endif
|
|
+ )
|
|
+ {
|
|
c->read->handler = ngx_ssl_handshake_handler;
|
|
c->write->handler = ngx_ssl_handshake_handler;
|
|
|