IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-18 21:23:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

Limit recursive subrequests instead of simultaneous.

Browse Source
This commit is contained in:
Valentin Bartenev 2015-08-23 21:03:32 +03:00
parent fae2488df7
commit 0d3b15729c
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/http/ngx_http_core_module.c
View File

@ -2427,12 +2427,9 @@ ngx_http_subrequest(ngx_http_request_t *r,
ngx_http_core_srv_conf_t *cscf;
ngx_http_postponed_request_t *pr, *p;
r->main->subrequests--;
if (r->main->subrequests == 0) {
if (r->subrequests == 0) {
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
"subrequests cycle while processing \"%V\"", uri);
r->main->subrequests = 1;
return NGX_ERROR;
}
@ -2537,6 +2534,7 @@ ngx_http_subrequest(ngx_http_request_t *r,
sr->main_filter_need_in_memory = r->main_filter_need_in_memory;
sr->uri_changes = NGX_HTTP_MAX_URI_CHANGES + 1;
sr->subrequests = r->subrequests - 1;
tp = ngx_timeofday();
sr->start_sec = tp->sec;

1
src/http/ngx_http_request.c
View File

@ -2338,7 +2338,6 @@ ngx_http_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
if (r == c->data) {
r->main->count--;
r->main->subrequests++;
if (!r->logged) {