Release - v1.17.7

This commit is contained in:
2019-12-25 00:35:18 +09:00
parent b013300457
commit 1d1103eacb
16 changed files with 175 additions and 76 deletions
-31
View File
@@ -43,7 +43,6 @@ static ssize_t ngx_ssl_recv_early(ngx_connection_t *c, u_char *buf,
#endif
static ngx_int_t ngx_ssl_handle_recv(ngx_connection_t *c, int n);
static void ngx_ssl_write_handler(ngx_event_t *wev);
static void ngx_ssl_next_read_handler(ngx_event_t *rev);
#ifdef SSL_READ_EARLY_DATA_SUCCESS
static ssize_t ngx_ssl_write_early(ngx_connection_t *c, u_char *data,
size_t size);
@@ -2027,11 +2026,6 @@ ngx_ssl_recv(ngx_connection_t *c, u_char *buf, size_t size)
c->read->available = 0;
c->read->ready = 0;
if (c->ssl->next_read_handler == NULL) {
c->ssl->next_read_handler = c->read->handler;
c->read->handler = ngx_ssl_next_read_handler;
}
ngx_post_event(c->read, &ngx_posted_next_events);
}
@@ -2337,31 +2331,6 @@ ngx_ssl_write_handler(ngx_event_t *wev)
}
static void
ngx_ssl_next_read_handler(ngx_event_t *rev)
{
ngx_connection_t *c;
c = rev->data;
ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0, "SSL next read handler");
rev->handler = c->ssl->next_read_handler;
c->ssl->next_read_handler = NULL;
if (!rev->ready) {
rev->ready = 1;
rev->available = -1;
}
if (rev->posted) {
ngx_delete_posted_event(rev);
}
rev->handler(rev);
}
/*
* OpenSSL has no SSL_writev() so we copy several bufs into our 16K buffer
* before the SSL_write() call to decrease a SSL overhead.