mirror of
https://github.com/openresty/openresty.git
synced 2024-10-13 00:29:41 +00:00
clients
demo
misc
patches
lua-5.1.4-makefile_install_fix.patch
lua-5.1.5-disable_lua50_compat.patch
lua-5.1.5-makefile_install_fix.patch
lua_cjson-1.0.2-array_detection_fix.patch
nginx-0.8.54-allow_request_body_updating.patch
nginx-0.8.54-named_location_clear_mods_ctx.patch
nginx-0.8.54-no_Werror.patch
nginx-0.8.54-no_error_pages.patch
nginx-0.8.54-redirect_memcpy_overlap.patch
nginx-0.8.54-request_body_in_single_buf.patch
nginx-0.8.54-request_body_preread_fix.patch
nginx-0.8.54-server_header.patch
nginx-0.8.54-subrequest_loop.patch
nginx-0.8.54-variable_header_ignore_no_hash.patch
nginx-1.0.10-allow_request_body_updating.patch
nginx-1.0.10-epoll_check_stale_wev.patch
nginx-1.0.10-gzip_empty_flush_buf.patch
nginx-1.0.10-log_escape_non_ascii.patch
nginx-1.0.10-named_location_clear_mods_ctx.patch
nginx-1.0.10-no_Werror.patch
nginx-1.0.10-no_error_pages.patch
nginx-1.0.10-no_pool.patch
nginx-1.0.10-request_body_in_single_buf.patch
nginx-1.0.10-request_body_preread_fix.patch
nginx-1.0.10-server_header.patch
nginx-1.0.10-subrequest_loop.patch
nginx-1.0.10-variable_header_ignore_no_hash.patch
nginx-1.0.11-allow_request_body_updating.patch
nginx-1.0.11-epoll_check_stale_wev.patch
nginx-1.0.11-gzip_empty_flush_buf.patch
nginx-1.0.11-log_escape_non_ascii.patch
nginx-1.0.11-max_subrequests.patch
nginx-1.0.11-named_location_clear_mods_ctx.patch
nginx-1.0.11-no_Werror.patch
nginx-1.0.11-no_error_pages.patch
nginx-1.0.11-no_pool.patch
nginx-1.0.11-null_character_fixes.patch
nginx-1.0.11-request_body_in_single_buf.patch
nginx-1.0.11-request_body_preread_fix.patch
nginx-1.0.11-server_header.patch
nginx-1.0.11-subrequest_loop.patch
nginx-1.0.11-upstream_pipelining.patch
nginx-1.0.11-variable_header_ignore_no_hash.patch
nginx-1.0.12-allow_request_body_updating.patch
nginx-1.0.12-epoll_check_stale_wev.patch
nginx-1.0.12-gzip_empty_flush_buf.patch
nginx-1.0.12-log_escape_non_ascii.patch
nginx-1.0.12-max_subrequests.patch
nginx-1.0.12-named_location_clear_mods_ctx.patch
nginx-1.0.12-no_Werror.patch
nginx-1.0.12-no_error_pages.patch
nginx-1.0.12-no_pool.patch
nginx-1.0.12-request_body_in_single_buf.patch
nginx-1.0.12-request_body_preread_fix.patch
nginx-1.0.12-server_header.patch
nginx-1.0.12-subrequest_loop.patch
nginx-1.0.12-variable_header_ignore_no_hash.patch
nginx-1.0.14-allow_request_body_updating.patch
nginx-1.0.14-epoll_check_stale_wev.patch
nginx-1.0.14-gzip_empty_flush_buf.patch
nginx-1.0.14-log_escape_non_ascii.patch
nginx-1.0.14-max_subrequests.patch
nginx-1.0.14-named_location_clear_mods_ctx.patch
nginx-1.0.14-no_Werror.patch
nginx-1.0.14-no_error_pages.patch
nginx-1.0.14-no_pool.patch
nginx-1.0.14-null_character_fixes.patch
nginx-1.0.14-request_body_in_single_buf.patch
nginx-1.0.14-request_body_preread_fix.patch
nginx-1.0.14-server_header.patch
nginx-1.0.14-subrequest_loop.patch
nginx-1.0.14-upstream_pipelining.patch
nginx-1.0.14-variable_header_ignore_no_hash.patch
nginx-1.0.15-add_core_vars_polluting_globals.patch
nginx-1.0.15-allow_request_body_updating.patch
nginx-1.0.15-filter_finalize_hang.patch
nginx-1.0.15-gzip_empty_flush_buf.patch
nginx-1.0.15-log_escape_non_ascii.patch
nginx-1.0.15-max_subrequests.patch
nginx-1.0.15-named_location_clear_mods_ctx.patch
nginx-1.0.15-no_Werror.patch
nginx-1.0.15-no_error_pages.patch
nginx-1.0.15-no_pool.patch
nginx-1.0.15-null_character_fixes.patch
nginx-1.0.15-poll_del_event_at_exit.patch
nginx-1.0.15-request_body_in_single_buf.patch
nginx-1.0.15-request_body_preread_fix.patch
nginx-1.0.15-reset_wev_handler_in_named_locations.patch
nginx-1.0.15-resolver_debug_log_overflow.patch
nginx-1.0.15-server_header.patch
nginx-1.0.15-subrequest_loop.patch
nginx-1.0.15-upstream_pipelining.patch
nginx-1.0.15-variable_header_ignore_no_hash.patch
nginx-1.0.4-gcc46_fixes.patch
nginx-1.0.4-no_Werror.patch
nginx-1.0.4-no_error_pages.patch
nginx-1.0.4-no_pool.patch
nginx-1.0.4-request_body_in_single_buf.patch
nginx-1.0.4-request_body_preread_fix.patch
nginx-1.0.4-server_header.patch
nginx-1.0.4-subrequest_loop.patch
nginx-1.0.5-no_Werror.patch
nginx-1.0.5-no_error_pages.patch
nginx-1.0.5-no_pool.patch
nginx-1.0.5-request_body_in_single_buf.patch
nginx-1.0.5-request_body_preread_fix.patch
nginx-1.0.5-server_header.patch
nginx-1.0.5-subrequest_loop.patch
nginx-1.0.6-gzip_empty_flush_buf.patch
nginx-1.0.6-no_Werror.patch
nginx-1.0.6-no_error_pages.patch
nginx-1.0.6-no_pool.patch
nginx-1.0.6-request_body_in_single_buf.patch
nginx-1.0.6-request_body_preread_fix.patch
nginx-1.0.6-server_header.patch
nginx-1.0.6-subrequest_loop.patch
nginx-1.0.6-variable_header_ignore_no_hash.patch
nginx-1.0.8-allow_request_body_updating.patch
nginx-1.0.8-gzip_empty_flush_buf.patch
nginx-1.0.8-named_location_clear_mods_ctx.patch
nginx-1.0.8-no_Werror.patch
nginx-1.0.8-no_error_pages.patch
nginx-1.0.8-no_pool.patch
nginx-1.0.8-request_body_in_single_buf.patch
nginx-1.0.8-request_body_preread_fix.patch
nginx-1.0.8-server_header.patch
nginx-1.0.8-subrequest_loop.patch
nginx-1.0.8-variable_header_ignore_no_hash.patch
nginx-1.0.9-allow_request_body_updating.patch
nginx-1.0.9-epoll_check_stale_wev.patch
nginx-1.0.9-gzip_empty_flush_buf.patch
nginx-1.0.9-log_escape_non_ascii.patch
nginx-1.0.9-named_location_clear_mods_ctx.patch
nginx-1.0.9-no_Werror.patch
nginx-1.0.9-no_error_pages.patch
nginx-1.0.9-no_pool.patch
nginx-1.0.9-request_body_in_single_buf.patch
nginx-1.0.9-request_body_preread_fix.patch
nginx-1.0.9-server_header.patch
nginx-1.0.9-subrequest_loop.patch
nginx-1.0.9-variable_header_ignore_no_hash.patch
nginx-1.1.15-allow_request_body_updating.patch
nginx-1.1.15-gzip_empty_flush_buf.patch
nginx-1.1.15-log_escape_non_ascii.patch
nginx-1.1.15-named_location_clear_mods_ctx.patch
nginx-1.1.15-no_Werror.patch
nginx-1.1.15-no_error_pages.patch
nginx-1.1.15-no_pool.patch
nginx-1.1.15-server_header.patch
nginx-1.1.15-subrequest_loop.patch
nginx-1.1.2-no_error_pages.patch
nginx-1.1.4-variable_header_ignore_no_hash.patch
nginx-1.1.5-named_location_clear_mods_ctx.patch
nginx-1.2.1-add_core_vars_polluting_globals.patch
nginx-1.2.1-allow_request_body_updating.patch
nginx-1.2.1-dtrace.patch
nginx-1.2.1-location_if_inherits_proxy.patch
nginx-1.2.1-log_escape_non_ascii.patch
nginx-1.2.1-no_Werror.patch
nginx-1.2.1-no_error_pages.patch
nginx-1.2.1-no_pool.patch
nginx-1.2.1-poll_del_event_at_exit.patch
nginx-1.2.1-resolver_debug_log_overflow.patch
nginx-1.2.1-server_header.patch
nginx-1.2.1-upstream_pipelining.patch
nginx-1.3.0-resolver_debug_log_overflow.patch
specs
t
util
.gitignore
Makefile
README
41 lines
1.2 KiB
Diff
41 lines
1.2 KiB
Diff
# HG changeset patch
|
|
# User Maxim Dounin <mdounin@mdounin.ru>
|
|
# Date 1309187571 -14400
|
|
# Node ID 283a416b2235d5383c12a975edc8866f007fb628
|
|
# Parent f5fc40783ddcbf4db33859ee2a9bce54cf32c350
|
|
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
|
|
@@ -2287,7 +2287,6 @@ ngx_http_subrequest(ngx_http_request_t *
|
|
sr->start_sec = tp->sec;
|
|
sr->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
|
|
@@ -1981,6 +1981,7 @@ ngx_http_finalize_request(ngx_http_reque
|
|
if (r == c->data) {
|
|
|
|
r->main->count--;
|
|
+ r->main->subrequests++;
|
|
|
|
if (!r->logged) {
|
|
|