fix dynamic tls patch for boring-nginx

This commit is contained in:
Roman Hoellen 2018-09-26 08:40:06 +02:00
parent 7cda0dc28a
commit 5c35737b3f

View File

@ -27,7 +27,7 @@ https://github.com/cloudflare/sslconfig/blob/master/patches/nginx__dynamic_tls_r
--- a/src/event/ngx_event_openssl.c --- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c +++ b/src/event/ngx_event_openssl.c
@@ -1239,6 +1239,7 @@ @@ -1267,6 +1267,7 @@
sc->buffer = ((flags & NGX_SSL_BUFFER) != 0); sc->buffer = ((flags & NGX_SSL_BUFFER) != 0);
sc->buffer_size = ssl->buffer_size; sc->buffer_size = ssl->buffer_size;
@ -35,7 +35,7 @@ https://github.com/cloudflare/sslconfig/blob/master/patches/nginx__dynamic_tls_r
sc->session_ctx = ssl->ctx; sc->session_ctx = ssl->ctx;
@@ -1806,6 +1807,41 @@ @@ -2115,6 +2116,41 @@
for ( ;; ) { for ( ;; ) {
@ -77,7 +77,7 @@ https://github.com/cloudflare/sslconfig/blob/master/patches/nginx__dynamic_tls_r
while (in && buf->last < buf->end && send < limit) { while (in && buf->last < buf->end && send < limit) {
if (in->buf->last_buf || in->buf->flush) { if (in->buf->last_buf || in->buf->flush) {
flush = 1; flush = 1;
@@ -1907,6 +1643,9 @@ @@ -2222,6 +2258,9 @@
if (n > 0) { if (n > 0) {
@ -109,10 +109,10 @@ https://github.com/cloudflare/sslconfig/blob/master/patches/nginx__dynamic_tls_r
}; };
@@ -93,6 +102,10 @@ @@ -98,6 +107,10 @@
unsigned no_wait_shutdown:1; unsigned try_early_data:1;
unsigned no_send_shutdown:1; unsigned in_early:1;
unsigned handshake_buffer_set:1; unsigned early_preread:1;
+ +
+ ngx_ssl_dyn_rec_t dyn_rec; + ngx_ssl_dyn_rec_t dyn_rec;
+ ngx_msec_t dyn_rec_last_write; + ngx_msec_t dyn_rec_last_write;
@ -120,7 +120,7 @@ https://github.com/cloudflare/sslconfig/blob/master/patches/nginx__dynamic_tls_r
}; };
@@ -102,7 +115,7 @@ @@ -107,7 +120,7 @@
#define NGX_SSL_DFLT_BUILTIN_SCACHE -5 #define NGX_SSL_DFLT_BUILTIN_SCACHE -5