summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2014-11-28 16:57:50 +0300
committerMaxim Dounin <mdounin@mdounin.ru>2014-11-28 16:57:50 +0300
commitcb451bd6a46dd4b3053bc4ec2f667d4970c41665 (patch)
tree0a1875e756c3f6f98049991b372c8a6ad7fe45b2
parent4dafec8d514a685f1da0d097f53313b53e0c759a (diff)
downloadnginx-cb451bd6a46dd4b3053bc4ec2f667d4970c41665.tar.gz
nginx-cb451bd6a46dd4b3053bc4ec2f667d4970c41665.tar.bz2
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.
-rw-r--r--src/http/ngx_http_core_module.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 4484a5ed4..1bcd1045c 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -1935,6 +1935,10 @@ ngx_http_send_response(ngx_http_request_t *r, ngx_uint_t status,
ngx_int_t
ngx_http_send_header(ngx_http_request_t *r)
{
+ if (r->post_action) {
+ return NGX_OK;
+ }
+
if (r->header_sent) {
ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
"header already sent");