diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2013-08-30 21:44:16 +0400 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2013-08-30 21:44:16 +0400 |
| commit | 9f46a9df864c74a2b175840895173e1ddb2cf6f3 (patch) | |
| tree | e1ec07cf0b2f957adb09ca1a6e0813834d9a747c /src | |
| parent | 6d7ec5009a585fbbfa01a1b02fe7116957bcf5f0 (diff) | |
| download | nginx-9f46a9df864c74a2b175840895173e1ddb2cf6f3.tar.gz nginx-9f46a9df864c74a2b175840895173e1ddb2cf6f3.tar.bz2 | |
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 (limited to 'src')
| -rw-r--r-- | src/http/ngx_http_upstream.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c index 652222f8f..f4221edde 100644 --- 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_request_t *r, ngx_http_upstream_t *u) 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_request_t *r, ngx_http_upstream_t *u) } } - 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; |