mirror of https://github.com/openresty/openresty
You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
37 lines
1.1 KiB
C
37 lines
1.1 KiB
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,17 @@ 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
|
|
+
|
|
+# else
|
|
+# ifdef SSL_ERROR_WANT_CLIENT_HELLO_CB
|
|
+ || sslerr == SSL_ERROR_WANT_CLIENT_HELLO_CB
|
|
+# endif
|
|
+# endif
|
|
+ )
|
|
+ {
|
|
c->read->handler = ngx_ssl_handshake_handler;
|
|
c->write->handler = ngx_ssl_handshake_handler;
|
|
|
|
diff --git a/src/event/ngx_event_openssl.h b/src/event/ngx_event_openssl.h
|
|
--- a/src/event/ngx_event_openssl.h
|
|
+++ b/src/event/ngx_event_openssl.h
|
|
@@ -59,6 +59,11 @@
|
|
#endif
|
|
|
|
|
|
+#ifdef SSL_ERROR_WANT_CLIENT_HELLO_CB
|
|
+#define HAVE_SSL_CLIENT_HELLO_CB_SUPPORT 1
|
|
+#endif
|
|
+
|
|
+
|
|
struct ngx_ssl_s {
|
|
SSL_CTX *ctx;
|
|
ngx_log_t *log;
|