diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2011-08-29 12:56:09 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2011-08-29 12:56:09 +0000 |
| commit | 8f8839f98db7c44f821e68f28614094e30fb8b22 (patch) | |
| tree | 0010548b3a9e43a9bfbdcee717660fd5cdfd2679 /src/http/modules/ngx_http_scgi_module.c | |
| parent | 1c95e6c3050bf2114d72029824fdadf001cc300e (diff) | |
| download | nginx-8f8839f98db7c44f821e68f28614094e30fb8b22.tar.gz nginx-8f8839f98db7c44f821e68f28614094e30fb8b22.zip | |
Merge of r3964, r3977, r3978:
Proxy related fixes:
*) finalizing with rc == 0 in unbuffered proxy mode caused nginx to wait
for another send_timeout before actually closing client's connection
if client timed out while still talking to upstream server
*) update r3945 with more descriptive error message
*) test length of proxy_pass with variables;
patch by Lanshun Zhou
Diffstat (limited to 'src/http/modules/ngx_http_scgi_module.c')
| -rw-r--r-- | src/http/modules/ngx_http_scgi_module.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/http/modules/ngx_http_scgi_module.c b/src/http/modules/ngx_http_scgi_module.c index d745551f2..c83d77044 100644 --- a/src/http/modules/ngx_http_scgi_module.c +++ b/src/http/modules/ngx_http_scgi_module.c @@ -1030,6 +1030,8 @@ ngx_http_scgi_create_loc_conf(ngx_conf_t *cf) /* "scgi_cyclic_temp_file" is disabled */ conf->upstream.cyclic_temp_file = 0; + ngx_str_set(&conf->upstream.module, "scgi"); + return conf; } |