diff options
author | Roman Arutyunyan <arut@nginx.com> | 2020-02-28 19:54:13 +0300 |
---|---|---|
committer | Roman Arutyunyan <arut@nginx.com> | 2020-02-28 19:54:13 +0300 |
commit | 76ac67b36f2db9acb2aeb4672f0aeaa8008e7d93 (patch) | |
tree | 4f99c65e6c171debb5df353dc2b8eefd0192273a /src/http | |
parent | 3733c6fd70a9e9ce64901982621629a8cfcc66a8 (diff) |
Simplified subrequest finalization.
Now it looks similar to what it was before background subrequests were
introduced in 9552758a786e.
Diffstat (limited to 'src/http')
-rw-r--r-- | src/http/ngx_http_request.c | 34 |
1 files changed, 11 insertions, 23 deletions
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c index 5fcaa2c33..eb53996b1 100644 --- a/src/http/ngx_http_request.c +++ b/src/http/ngx_http_request.c @@ -2488,7 +2488,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->buffered || r->postponed) { @@ -2499,32 +2498,14 @@ ngx_http_finalize_request(ngx_http_request_t *r, ngx_int_t rc) return; } - 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; - } - 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); } @@ -2539,6 +2520,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; } |