Welcome! Log In Create A New Profile

[PATCH 27 of 31] Core: protect from subrequest loops

Forum List Message List New Topic Print View

Maxim Dounin

February 15, 2011 08:46AM

# HG changeset patch
# User Maxim Dounin <mdounin@mdounin.ru>
# Date 1297776703 -10800
# Node ID 04d83b2dd806307ec120c322e936588350636ffb
# Parent 2fe2f9c552aca65581268a5add6b37eba5f86e6c
Core: protect from subrequest loops.

Without protection subrequest loop results in r->count overflow and
SIGSEGV. Protection was broken in 0.7.25.

Note that this also limits number of parallel subrequests. This
wasn't exactly the case before 0.7.25 as local subrequests were
completed directly.

See here for details:

http://nginx.org/pipermail/nginx-ru/2010-February/032184.html

diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -2293,7 +2293,6 @@ ngx_http_subrequest(ngx_http_request_t *
r->start_sec = tp->sec;
r->start_msec = tp->msec;

- r->main->subrequests++;
r->main->count++;

*psr = sr;
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -1976,6 +1976,7 @@ ngx_http_finalize_request(ngx_http_reque
if (r == c->data) {

r->main->count--;
+ r->main->subrequests++;

if (!r->logged) {

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://nginx.org/mailman/listinfo/nginx-devel

Reply Quote

RSS

Subject	Author	Views	Posted
[PATCH 00 of 31] generic patch queue for 0.9.4	Maxim Dounin	2947	February 15, 2011 08:38AM
[PATCH 01 of 31] Reuse keepalive connections if worker connections aren't enough	Maxim Dounin	894	February 15, 2011 08:38AM
[PATCH 02 of 31] Complain on invalid log levels	Maxim Dounin	986	February 15, 2011 08:38AM
[PATCH 03 of 31] Fix u->one_addr handling in ngx_inet_resolve_host()	Maxim Dounin	737	February 15, 2011 08:38AM
[PATCH 04 of 31] Fix incorrect 201 replies from dav module	Maxim Dounin	773	February 15, 2011 08:38AM
[PATCH 05 of 31] Fix error_page status code change in redirect	Maxim Dounin	765	February 15, 2011 08:38AM
[PATCH 06 of 31] Fix double content when return is used in error_page redirection	Maxim Dounin	743	February 15, 2011 08:40AM
[PATCH 07 of 31] Drop incorrect special case for return 204	Maxim Dounin	782	February 15, 2011 08:40AM
[PATCH 08 of 31] Clear old Location header (if any) while adding new one	Maxim Dounin	821	February 15, 2011 08:40AM
[PATCH 09 of 31] Better handle various per-server ssl options with SNI	Maxim Dounin	847	February 15, 2011 08:40AM
[PATCH 10 of 31] Better handle late upstream creation	Maxim Dounin	838	February 15, 2011 08:40AM
[PATCH 12 of 31] Fix predicate testing (_cache_bypass, _no_cache)	Maxim Dounin	838	February 15, 2011 08:42AM
[PATCH 11 of 31] Gzip filter: handle empty flush buffers	Maxim Dounin	823	February 15, 2011 08:42AM
[PATCH 13 of 31] Fix connection drops with AIO	Maxim Dounin	893	February 15, 2011 08:42AM
[PATCH 14 of 31] Fix socket leak with "aio sendfile" and "limit_rate" directives	Maxim Dounin	941	February 15, 2011 08:42AM
[PATCH 15 of 31] Correctly handle Content-Encoding set from perl	Maxim Dounin	809	February 15, 2011 08:42AM
[PATCH 16 of 31] Gzip static: "always" parameter in "gzip_static" directive	Maxim Dounin	921	February 15, 2011 08:42AM
[PATCH 17 of 31] Memcached: memcached_gzip_flag directive	Maxim Dounin	920	February 15, 2011 08:42AM
[PATCH 18 of 31] Mail: handle smtp multiline replies	Maxim Dounin	859	February 15, 2011 08:44AM
[PATCH 19 of 31] Additional headers for proxy_ignore_headers/fastcgi_ignore_headers	Maxim Dounin	893	February 15, 2011 08:44AM
[PATCH 20 of 31] Fix cpu hog with all upstream servers marked "down"	Maxim Dounin	859	February 15, 2011 08:44AM
[PATCH 21 of 31] Cache: correctly set conf_file while adding paths	Maxim Dounin	810	February 15, 2011 08:44AM
[PATCH 22 of 31] Fastcgi: fix large stderr handling without cache	Maxim Dounin	830	February 15, 2011 08:44AM
[PATCH 23 of 31] Upstream: fix proxy_store leaving temporary files for subrequests	Maxim Dounin	972	February 15, 2011 08:44AM
[PATCH 24 of 31] Cache: fix sending of empty responses	Maxim Dounin	857	February 15, 2011 08:46AM
[PATCH 25 of 31] Cache: fix sending of stale responses	Maxim Dounin	838	February 15, 2011 08:46AM
[PATCH 26 of 31] Variables: honor no_cacheable for not_found variables	Maxim Dounin	844	February 15, 2011 08:46AM
[PATCH 27 of 31] Core: protect from subrequest loops	Maxim Dounin	882	February 15, 2011 08:46AM
[PATCH 29 of 31] Autoindex: escape '?' in file names	Maxim Dounin	873	February 15, 2011 08:46AM
[PATCH 28 of 31] Core: resolve various cycles with named locations and post_action	Maxim Dounin	841	February 15, 2011 08:46AM
[PATCH 30 of 31] Autoindex: escape html in file names	Maxim Dounin	931	February 15, 2011 08:48AM
[PATCH 31 of 31] Unbreak build with embedded perl and --with-openssl	Maxim Dounin	792	February 15, 2011 08:48AM
Re: [PATCH 00 of 31] generic patch queue for 0.9.4	Kirill A. Korinskiy	795	February 15, 2011 09:04AM
Re: [PATCH 00 of 31] generic patch queue for 0.9.4	Piotr Sikora	794	February 15, 2011 09:22AM
Re: [PATCH 00 of 31] generic patch queue for 0.9.4	Maxim Dounin	774	February 15, 2011 11:24AM
Re: [PATCH 00 of 31] generic patch queue for 0.9.4	deltay	931	February 15, 2011 08:40PM
Re: [PATCH 00 of 31] generic patch queue for 0.9.4	António P. P. Almeida	832	February 21, 2011 10:08AM
Re: [PATCH 00 of 31] generic patch queue for 0.9.4	Maxim Dounin	1158	February 21, 2011 11:24AM

Sorry, you do not have permission to post/reply in this forum.

Online Users

Guests: 196

Record Number of Users: 8 on April 13, 2023

Record Number of Guests: 421 on December 02, 2018