diff options
author | Roman Arutyunyan <arut@nginx.com> | 2017-06-14 20:13:41 +0300 |
---|---|---|
committer | Roman Arutyunyan <arut@nginx.com> | 2017-06-14 20:13:41 +0300 |
commit | efa61f42c10355263fd883e53f3e690fe01770a0 (patch) | |
tree | 4d1c6afd7a7216dd7b9ba3d89004ac1491222ce5 | |
parent | 439e205255267662c04d13c3404937e3324e06a5 (diff) | |
download | nginx-efa61f42c10355263fd883e53f3e690fe01770a0.tar.gz |
Upstream: fixed running posted requests (ticket #788).
Previously, the upstream resolve handler always called
ngx_http_run_posted_requests() to run posted requests after processing the
resolver response. However, if the handler was called directly from the
ngx_resolve_name() function (for example, if the resolver response was cached),
running posted requests from the handler could lead to the following errors:
- If the request was scheduled for termination, it could actually be terminated
in the resolve handler. Upper stack frames could reference the freed request
object in this case.
- If a significant number of requests were posted, and for each of them the
resolve handler was called directly from the ngx_resolve_name() function,
posted requests could be run recursively and lead to stack overflow.
Now ngx_http_run_posted_requests() is only called from asynchronously invoked
resolve handlers.
-rw-r--r-- | src/http/ngx_http_upstream.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c index 324c59b7e..8207608c7 100644 --- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -1143,11 +1143,14 @@ ngx_http_upstream_cache_check_range(ngx_http_request_t *r, static void ngx_http_upstream_resolve_handler(ngx_resolver_ctx_t *ctx) { + ngx_uint_t run_posted; ngx_connection_t *c; ngx_http_request_t *r; ngx_http_upstream_t *u; ngx_http_upstream_resolved_t *ur; + run_posted = ctx->async; + r = ctx->data; c = r->connection; @@ -1211,7 +1214,9 @@ ngx_http_upstream_resolve_handler(ngx_resolver_ctx_t *ctx) failed: - ngx_http_run_posted_requests(c); + if (run_posted) { + ngx_http_run_posted_requests(c); + } } |