Mercurial > hg > nginx-quic
comparison src/http/modules/ngx_http_uwsgi_module.c @ 4045:2d062c031fff stable-1.0
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
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Mon, 29 Aug 2011 12:56:09 +0000 |
| parents | 502a6b0acf3f |
| children | e0a435f5f504 |
comparison
equal
deleted
inserted
replaced
| 4044:0ea785433fcf | 4045:2d062c031fff |
|---|---|
| 1081 conf->upstream.intercept_errors = NGX_CONF_UNSET; | 1081 conf->upstream.intercept_errors = NGX_CONF_UNSET; |
| 1082 | 1082 |
| 1083 /* "uwsgi_cyclic_temp_file" is disabled */ | 1083 /* "uwsgi_cyclic_temp_file" is disabled */ |
| 1084 conf->upstream.cyclic_temp_file = 0; | 1084 conf->upstream.cyclic_temp_file = 0; |
| 1085 | 1085 |
| 1086 ngx_str_set(&conf->upstream.module, "uwsgi"); | |
| 1087 | |
| 1086 return conf; | 1088 return conf; |
| 1087 } | 1089 } |
| 1088 | 1090 |
| 1089 | 1091 |
| 1090 static char * | 1092 static char * |