Mercurial > hg > nginx
comparison src/http/ngx_http_upstream.c @ 5353:1608b1135a1d
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.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Fri, 30 Aug 2013 21:44:16 +0400 |
parents | 13a5f4765887 |
children | cd46297325bd |
comparison
equal
deleted
inserted
replaced
5352:ec0be12c8e29 | 5353:1608b1135a1d |
---|---|
2103 if (rc == NGX_ERROR || rc > NGX_OK || r->post_action) { | 2103 if (rc == NGX_ERROR || rc > NGX_OK || r->post_action) { |
2104 ngx_http_upstream_finalize_request(r, u, rc); | 2104 ngx_http_upstream_finalize_request(r, u, rc); |
2105 return; | 2105 return; |
2106 } | 2106 } |
2107 | 2107 |
2108 u->header_sent = 1; | |
2109 | |
2108 if (u->upgrade) { | 2110 if (u->upgrade) { |
2109 ngx_http_upstream_upgrade(r, u); | 2111 ngx_http_upstream_upgrade(r, u); |
2110 return; | 2112 return; |
2111 } | 2113 } |
2112 | 2114 |
2128 } else { | 2130 } else { |
2129 ngx_http_upstream_finalize_request(r, u, rc); | 2131 ngx_http_upstream_finalize_request(r, u, rc); |
2130 return; | 2132 return; |
2131 } | 2133 } |
2132 } | 2134 } |
2133 | |
2134 u->header_sent = 1; | |
2135 | 2135 |
2136 if (r->request_body && r->request_body->temp_file) { | 2136 if (r->request_body && r->request_body->temp_file) { |
2137 ngx_pool_run_cleanup_file(r->pool, r->request_body->temp_file->file.fd); | 2137 ngx_pool_run_cleanup_file(r->pool, r->request_body->temp_file->file.fd); |
2138 r->request_body->temp_file->file.fd = NGX_INVALID_FILE; | 2138 r->request_body->temp_file->file.fd = NGX_INVALID_FILE; |
2139 } | 2139 } |