aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2019-07-12 15:39:25 +0300
committerMaxim Dounin <mdounin@mdounin.ru>2019-07-12 15:39:25 +0300
commit78b39bd631fc18fd5778090183776f5275005e21 (patch)
tree8e45484babb4cedc437a129a6a7285fc413c68ab /src
parent12d6b3b4a1d024bd8098e20b43b0b7020e5286e6 (diff)
downloadnginx-78b39bd631fc18fd5778090183776f5275005e21.tar.gz
nginx-78b39bd631fc18fd5778090183776f5275005e21.zip
Perl: avoid returning 500 if header was already sent.
Returning NGX_HTTP_INTERNAL_SERVER_ERROR if a perl code died after sending header will lead to a "header already sent" alert. To avoid it, we now check if header was already sent, and return NGX_ERROR instead if it was.
Diffstat (limited to 'src')
-rw-r--r--src/http/modules/perl/nginx.xs2
-rw-r--r--src/http/modules/perl/ngx_http_perl_module.c4
-rw-r--r--src/http/modules/perl/ngx_http_perl_module.h1
3 files changed, 7 insertions, 0 deletions
diff --git a/src/http/modules/perl/nginx.xs b/src/http/modules/perl/nginx.xs
index 67ec0a564..34ce9daed 100644
--- a/src/http/modules/perl/nginx.xs
+++ b/src/http/modules/perl/nginx.xs
@@ -164,6 +164,8 @@ send_http_header(r, ...)
}
}
+ ctx->header_sent = 1;
+
r->disable_not_modified = 1;
rc = ngx_http_send_header(r);
diff --git a/src/http/modules/perl/ngx_http_perl_module.c b/src/http/modules/perl/ngx_http_perl_module.c
index 81b2526ad..dc2125935 100644
--- a/src/http/modules/perl/ngx_http_perl_module.c
+++ b/src/http/modules/perl/ngx_http_perl_module.c
@@ -780,6 +780,10 @@ ngx_http_perl_call_handler(pTHX_ ngx_http_request_t *r,
ctx->redirect_uri.len = 0;
+ if (ctx->header_sent) {
+ return NGX_ERROR;
+ }
+
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}
diff --git a/src/http/modules/perl/ngx_http_perl_module.h b/src/http/modules/perl/ngx_http_perl_module.h
index b67ce137c..da3a16235 100644
--- a/src/http/modules/perl/ngx_http_perl_module.h
+++ b/src/http/modules/perl/ngx_http_perl_module.h
@@ -34,6 +34,7 @@ typedef struct {
unsigned done:1;
unsigned error:1;
unsigned variable:1;
+ unsigned header_sent:1;
ngx_array_t *variables; /* array of ngx_http_perl_var_t */