Simplified subrequest finalization.
Now it looks similar to what it was before background subrequests were
introduced in 9552758a786e.
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index 5fcaa2c..eb53996 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -2488,7 +2488,6 @@
}
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 @@
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 @@
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;
}