Upstream: fixed previous commit.

Store r->connection on stack to make sure it's still available if request
finalization happens to actually free request memory.
This commit is contained in:
Maxim Dounin 2013-03-14 16:22:43 +00:00
parent c49abd2317
commit 3f70ddcfc6

View File

@ -878,11 +878,13 @@ ngx_http_upstream_cache_send(ngx_http_request_t *r, ngx_http_upstream_t *u)
static void static void
ngx_http_upstream_resolve_handler(ngx_resolver_ctx_t *ctx) ngx_http_upstream_resolve_handler(ngx_resolver_ctx_t *ctx)
{ {
ngx_connection_t *c;
ngx_http_request_t *r; ngx_http_request_t *r;
ngx_http_upstream_t *u; ngx_http_upstream_t *u;
ngx_http_upstream_resolved_t *ur; ngx_http_upstream_resolved_t *ur;
r = ctx->data; r = ctx->data;
c = r->connection;
u = r->upstream; u = r->upstream;
ur = u->resolved; ur = u->resolved;
@ -929,7 +931,7 @@ ngx_http_upstream_resolve_handler(ngx_resolver_ctx_t *ctx)
failed: failed:
ngx_http_run_posted_requests(r->connection); ngx_http_run_posted_requests(c);
} }