mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-12 21:52:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Upstream: upstream argument in ngx_http_upstream_process_request().

Browse Source 
In case of filter finalization, r->upstream might be changed during
the ngx_event_pipe() call.  Added an argument to preserve it while
calling the ngx_http_upstream_process_request() function.
This commit is contained in:
Maxim Dounin 2015-03-02 21:44:42 +03:00
parent 2b032e8df6
commit 14a93c5a15
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/http/ngx_http_upstream.c
View File

@ -76,7 +76,8 @@ static ngx_int_t ngx_http_upstream_non_buffered_filter(void *data,
static void ngx_http_upstream_process_downstream(ngx_http_request_t *r); static void ngx_http_upstream_process_downstream(ngx_http_request_t *r);
static void ngx_http_upstream_process_upstream(ngx_http_request_t *r, static void ngx_http_upstream_process_upstream(ngx_http_request_t *r,
ngx_http_upstream_t *u); ngx_http_upstream_t *u);
static void ngx_http_upstream_process_request(ngx_http_request_t *r); static void ngx_http_upstream_process_request(ngx_http_request_t *r,
ngx_http_upstream_t *u);
static void ngx_http_upstream_store(ngx_http_request_t *r, static void ngx_http_upstream_store(ngx_http_request_t *r,
ngx_http_upstream_t *u); ngx_http_upstream_t *u);
static void ngx_http_upstream_dummy_handler(ngx_http_request_t *r, static void ngx_http_upstream_dummy_handler(ngx_http_request_t *r,
@ -3349,7 +3350,7 @@ ngx_http_upstream_process_downstream(ngx_http_request_t *r)
} }
} }
ngx_http_upstream_process_request(r); ngx_http_upstream_process_request(r, u);
} }
@ -3417,18 +3418,17 @@ ngx_http_upstream_process_upstream(ngx_http_request_t *r,
} }
} }
ngx_http_upstream_process_request(r); ngx_http_upstream_process_request(r, u);
} }
static void static void
ngx_http_upstream_process_request(ngx_http_request_t *r) ngx_http_upstream_process_request(ngx_http_request_t *r,
ngx_http_upstream_t *u)
{ {
ngx_temp_file_t *tf; ngx_temp_file_t *tf;
ngx_event_pipe_t *p; ngx_event_pipe_t *p;
ngx_http_upstream_t *u;
u = r->upstream;
p = u->pipe; p = u->pipe;
if (u->peer.connection) { if (u->peer.connection) {