[nginx] Upstream: setting u->header_sent before ngx_http_upstrea...

[Maxim Dounin]

details:   http://hg.nginx.org/nginx/rev/1608b1135a1d
branches:  
changeset: 5353:1608b1135a1d
user:      Maxim Dounin <mdounin at mdounin.ru>
date:      Fri Aug 30 21:44:16 2013 +0400
description:
Upstream: setting u->header_sent before ngx_http_upstream_upgrade().

Without u->header_sent set a special response might be generated following
an upgraded connection.  The problem appeared in 1ccdda1f37f3 (1.5.3).
Catched by "header already sent" alerts in 1.5.4 after upstream timeouts.

diffstat:

 src/http/ngx_http_upstream.c |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (21 lines):

diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -2105,6 +2105,8 @@ ngx_http_upstream_send_response(ngx_http
         return;
     }
 
+    u->header_sent = 1;
+
     if (u->upgrade) {
         ngx_http_upstream_upgrade(r, u);
         return;
@@ -2131,8 +2133,6 @@ ngx_http_upstream_send_response(ngx_http
         }
     }
 
-    u->header_sent = 1;
-
     if (r->request_body && r->request_body->temp_file) {
         ngx_pool_run_cleanup_file(r->pool, r->request_body->temp_file->file.fd);
         r->request_body->temp_file->file.fd = NGX_INVALID_FILE;