mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-04 22:09:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Upstream: call ngx_http_run_posted_requests() on resolve errors.

Browse Source 
If proxy_pass to a host with dynamic resolution was used to handle
a subrequest, and host resolution failed, the main request wasn't run
till something else happened on the connection.  E.g. request to "/zzz"
with the following configuration hanged:

    addition_types *;
    resolver 8.8.8.8;

    location /test {
        set $ihost xxx;
        proxy_pass http://$ihost;
    }

    location /zzz {
      add_after_body /test;
      return 200 "test";
    }

Report and original version of the patch by Lanshun Zhou,
http://mailman.nginx.org/pipermail/nginx-devel/2013-March/003476.html.
This commit is contained in:
Maxim Dounin 2013-03-14 12:37:54 +00:00
parent 4641497e9c
commit c49abd2317
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/http/ngx_http_upstream.c
View File

@ -894,7 +894,7 @@ ngx_http_upstream_resolve_handler(ngx_resolver_ctx_t *ctx)
ngx_resolver_strerror(ctx->state)); ngx_resolver_strerror(ctx->state));
ngx_http_upstream_finalize_request(r, u, NGX_HTTP_BAD_GATEWAY); ngx_http_upstream_finalize_request(r, u, NGX_HTTP_BAD_GATEWAY);
return; goto failed;
} }
ur->naddrs = ctx->naddrs; ur->naddrs = ctx->naddrs;
@ -919,13 +919,17 @@ ngx_http_upstream_resolve_handler(ngx_resolver_ctx_t *ctx)
if (ngx_http_upstream_create_round_robin_peer(r, ur) != NGX_OK) { if (ngx_http_upstream_create_round_robin_peer(r, ur) != NGX_OK) {
ngx_http_upstream_finalize_request(r, u, ngx_http_upstream_finalize_request(r, u,
NGX_HTTP_INTERNAL_SERVER_ERROR); NGX_HTTP_INTERNAL_SERVER_ERROR);
return; goto failed;
} }
ngx_resolve_name_done(ctx); ngx_resolve_name_done(ctx);
ur->ctx = NULL; ur->ctx = NULL;
ngx_http_upstream_connect(r, u); ngx_http_upstream_connect(r, u);
failed:
ngx_http_run_posted_requests(r->connection);
} }