Mercurial > hg > nginx

comparison src/http/ngx_http_core_module.c @ 6079:8e56f649fd0d stable-1.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed post_action to not trigger "header already sent" alert. The alert was introduced in 03ff14058272 (1.5.4), and was triggered on each post_action invocation. There is no real need to call header filters in case of post_action, so return NGX_OK from ngx_http_send_header() if r->post_action is set.
author Maxim Dounin <mdounin@mdounin.ru>
date Fri, 28 Nov 2014 16:57:50 +0300
parents b51bd021808b
children
comparison
equal deleted inserted replaced
6078:7ea6f5140ed9 6079:8e56f649fd0d
1933 1933
1934 1934
1935 ngx_int_t 1935 ngx_int_t
1936 ngx_http_send_header(ngx_http_request_t *r) 1936 ngx_http_send_header(ngx_http_request_t *r)
1937 { 1937 {
1938 if (r->post_action) {
1939 return NGX_OK;
1940 }
1941
1938 if (r->header_sent) { 1942 if (r->header_sent) {
1939 ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0, 1943 ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
1940 "header already sent"); 1944 "header already sent");
1941 return NGX_ERROR; 1945 return NGX_ERROR;
1942 } 1946 }