IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-22 15:13:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix r3628

Browse Source
This commit is contained in:
Igor Sysoev 2010-06-15 15:27:06 +00:00
parent 1cc1b311af
commit 2515f8efe9
2 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/http/modules/ngx_http_proxy_module.c
View File

@ -83,9 +83,6 @@ typedef struct {
} ngx_http_proxy_ctx_t; } ngx_http_proxy_ctx_t;
#define NGX_HTTP_PROXY_PARSE_NO_HEADER 20
static ngx_int_t ngx_http_proxy_eval(ngx_http_request_t *r, static ngx_int_t ngx_http_proxy_eval(ngx_http_request_t *r,
ngx_http_proxy_ctx_t *ctx, ngx_http_proxy_loc_conf_t *plcf); ngx_http_proxy_ctx_t *ctx, ngx_http_proxy_loc_conf_t *plcf);
#if (NGX_HTTP_CACHE) #if (NGX_HTTP_CACHE)

33
src/http/modules/ngx_http_uwsgi_module.c
View File

@ -36,17 +36,6 @@ typedef struct {
} ngx_http_uwsgi_loc_conf_t; } ngx_http_uwsgi_loc_conf_t;
typedef struct {
ngx_uint_t status;
ngx_uint_t status_count;
u_char *status_start;
u_char *status_end;
} ngx_http_uwsgi_ctx_t;
#define NGX_HTTP_UWSGI_PARSE_NO_HEADER 20
static ngx_int_t ngx_http_uwsgi_eval(ngx_http_request_t *r, static ngx_int_t ngx_http_uwsgi_eval(ngx_http_request_t *r,
ngx_http_uwsgi_loc_conf_t *uwcf); ngx_http_uwsgi_loc_conf_t *uwcf);
static ngx_int_t ngx_http_uwsgi_create_request(ngx_http_request_t *r); static ngx_int_t ngx_http_uwsgi_create_request(ngx_http_request_t *r);
@ -424,8 +413,8 @@ static ngx_int_t
ngx_http_uwsgi_handler(ngx_http_request_t *r) ngx_http_uwsgi_handler(ngx_http_request_t *r)
{ {
ngx_int_t rc; ngx_int_t rc;
ngx_http_status_t *status;
ngx_http_upstream_t *u; ngx_http_upstream_t *u;
ngx_http_uwsgi_ctx_t *ctx;
ngx_http_uwsgi_loc_conf_t *uwcf; ngx_http_uwsgi_loc_conf_t *uwcf;
if (r->subrequest_in_memory) { if (r->subrequest_in_memory) {
@ -439,12 +428,12 @@ ngx_http_uwsgi_handler(ngx_http_request_t *r)
return NGX_HTTP_INTERNAL_SERVER_ERROR; return NGX_HTTP_INTERNAL_SERVER_ERROR;
} }
ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_uwsgi_ctx_t)); status = ngx_pcalloc(r->pool, sizeof(ngx_http_status_t));
if (ctx == NULL) { if (status == NULL) {
return NGX_HTTP_INTERNAL_SERVER_ERROR; return NGX_HTTP_INTERNAL_SERVER_ERROR;
} }
ngx_http_set_ctx(r, ctx, ngx_http_uwsgi_module); ngx_http_set_ctx(r, status, ngx_http_uwsgi_module);
uwcf = ngx_http_get_module_loc_conf(r, ngx_http_uwsgi_module); uwcf = ngx_http_get_module_loc_conf(r, ngx_http_uwsgi_module);
@ -844,18 +833,18 @@ ngx_http_uwsgi_create_request(ngx_http_request_t *r)
static ngx_int_t static ngx_int_t
ngx_http_uwsgi_reinit_request(ngx_http_request_t *r) ngx_http_uwsgi_reinit_request(ngx_http_request_t *r)
{ {
ngx_http_uwsgi_ctx_t *ctx; ngx_http_status_t *status;
ctx = ngx_http_get_module_ctx(r, ngx_http_uwsgi_module); status = ngx_http_get_module_ctx(r, ngx_http_uwsgi_module);
if (ctx == NULL) { if (status == NULL) {
return NGX_OK; return NGX_OK;
} }
ctx->status = 0; status->code = 0;
ctx->status_count = 0; status->count = 0;
ctx->status_start = NULL; status->start = NULL;
ctx->status_end = NULL; status->end = NULL;
r->upstream->process_header = ngx_http_uwsgi_process_status_line; r->upstream->process_header = ngx_http_uwsgi_process_status_line;