Hakase/nginx-build
2
1 Fork 1
Code Issues Pull Requests Releases Activity

Latest update - 7632

Browse Source
This commit is contained in:
Hakase
2020-03-03 18:15:29 +09:00
parent a5a19139a3
commit 49dbf201ac
4 changed files with 14 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/naxsi
+1 -1
Submodule lib/naxsi updated: e9c3dd7133...15e58c3385
lib/ngx-fancyindex
+1 -1
Submodule lib/ngx-fancyindex updated: fa13aef31b...11101de198
lib/zlib
+1 -1
Submodule lib/zlib updated: af9ef2e94c...372bcd151c
src/http/ngx_http_request.c
+11 -23
View File
@@ -2502,26 +2502,6 @@ ngx_http_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
}
if (r != r->main) {
clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
if (r->background) {
if (!r->logged) {
if (clcf->log_subrequest) {
ngx_http_log_request(r);
}
r->logged = 1;
} else {
ngx_log_error(NGX_LOG_ALERT, c->log, 0,
"subrequest: \"%V?%V\" logged again",
&r->uri, &r->args);
}
r->done = 1;
ngx_http_finalize_connection(r);
return;
}
if (r->buffered || r->postponed) {
@@ -2534,11 +2514,12 @@ ngx_http_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
pr = r->parent;
if (r == c->data) {
r->main->count--;
if (r == c->data || r->background) {
if (!r->logged) {
clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
if (clcf->log_subrequest) {
ngx_http_log_request(r);
}
@@ -2553,6 +2534,13 @@ ngx_http_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
r->done = 1;
if (r->background) {
ngx_http_finalize_connection(r);
return;
}
r->main->count--;
if (pr->postponed && pr->postponed->request == r) {
pr->postponed = pr->postponed->next;
}