Author: mdounin
Date: 2013-03-14 16:22:43 +0000 (Thu, 14 Mar 2013)
New Revision: 5114
URL: http://trac.nginx.org/nginx/changeset/5114/nginx

Log:
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.


Modified:
trunk/src/http/ngx_http_upstream.c

Modified: trunk/src/http/ngx_http_upstream.c
===================================================================
--- trunk/src/http/ngx_http_upstream.c 2013-03-14 12:37:54 UTC (rev 5113)
+++ trunk/src/http/ngx_http_upstream.c 2013-03-14 16:22:43 UTC (rev 5114)
@@ -878,11 +878,13 @@
static void
ngx_http_upstream_resolve_handler(ngx_resolver_ctx_t *ctx)
{
+ ngx_connection_t *c;
ngx_http_request_t *r;
ngx_http_upstream_t *u;
ngx_http_upstream_resolved_t *ur;

r = ctx->data;
+ c = r->connection;

u = r->upstream;
ur = u->resolved;
@@ -929,7 +931,7 @@

failed:

- ngx_http_run_posted_requests(r->connection);
+ ngx_http_run_posted_requests(c);
}



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