From 86553d2e0a955c97846e621fb62a4d3550982ab1 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Fri, 30 Sep 2011 13:42:59 +0000 Subject: Merging r4010, r4065: SSL related fixes: *) Fixing proxy_set_body and proxy_pass_request_body with SSL. Flush flag wasn't set in constructed buffer and this prevented any data from being actually sent to upstream due to SSL buffering. Make sure we always set flush in the last buffer we are going to sent. See here for report: http://nginx.org/pipermail/nginx-ru/2011-June/041552.html *) Proper SSL shutdown handling. If connection has unsent alerts, SSL_shutdown() tries to send them even if SSL_set_shutdown(SSL_RECEIVED_SHUTDOWN|SSL_SENT_SHUTDOWN) was used. This can be prevented by SSL_set_quiet_shutdown(). SSL_set_shutdown() is required nevertheless to preserve session. --- src/http/modules/ngx_http_proxy_module.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/http/modules') diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c index 495b1743d..902cfb8f2 100644 --- a/src/http/modules/ngx_http_proxy_module.c +++ b/src/http/modules/ngx_http_proxy_module.c @@ -1132,12 +1132,11 @@ ngx_http_proxy_create_request(ngx_http_request_t *r) body = body->next; } - b->flush = 1; - } else { u->request_bufs = cl; } + b->flush = 1; cl->next = NULL; return NGX_OK; -- cgit