Mercurial > hg > nginx-vendor-current
comparison src/http/modules/ngx_http_uwsgi_module.c @ 656:9d21dad0b5a1 NGINX_1_1_12
nginx 1.1.12
*) Change: a "proxy_pass" directive without URI part now uses changed
URI after redirection with the "error_page" directive;
Thanks to Lanshun Zhou.
*) Feature: the "proxy/fastcgi/scgi/uwsgi_cache_lock",
"proxy/fastcgi/scgi/uwsgi_cache_lock_timeout" directives.
*) Feature: the "pcre_jit" directive.
*) Feature: the "if" SSI command supports captures in regular
expressions.
*) Bugfix: the "if" SSI command did not work inside the "block" command.
*) Bugfix: the "limit_conn_log_level" and "limit_req_log_level"
directives might not work.
*) Bugfix: the "limit_rate" directive did not allow to use full
throughput, even if limit value was very high.
*) Bugfix: the "sendfile_max_chunk" directive did not work, if the
"limit_rate" directive was used.
*) Bugfix: a "proxy_pass" directive without URI part always used
original request URI if variables were used.
*) Bugfix: a "proxy_pass" directive without URI part might use original
request after redirection with the "try_files" directive;
Thanks to Lanshun Zhou.
*) Bugfix: in the ngx_http_scgi_module.
*) Bugfix: in the ngx_http_mp4_module.
*) Bugfix: nginx could not be built on Solaris; the bug had appeared in
1.1.9.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Mon, 26 Dec 2011 00:00:00 +0400 |
parents | 753f505670e0 |
children | 5a4401b9551b |
comparison
equal
deleted
inserted
replaced
655:189afff6503f | 656:9d21dad0b5a1 |
---|---|
271 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE, | 271 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE, |
272 ngx_conf_set_bitmask_slot, | 272 ngx_conf_set_bitmask_slot, |
273 NGX_HTTP_LOC_CONF_OFFSET, | 273 NGX_HTTP_LOC_CONF_OFFSET, |
274 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.cache_methods), | 274 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.cache_methods), |
275 &ngx_http_upstream_cache_method_mask }, | 275 &ngx_http_upstream_cache_method_mask }, |
276 | |
277 { ngx_string("uwsgi_cache_lock"), | |
278 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, | |
279 ngx_conf_set_flag_slot, | |
280 NGX_HTTP_LOC_CONF_OFFSET, | |
281 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.cache_lock), | |
282 NULL }, | |
283 | |
284 { ngx_string("uwsgi_cache_lock_timeout"), | |
285 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
286 ngx_conf_set_msec_slot, | |
287 NGX_HTTP_LOC_CONF_OFFSET, | |
288 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.cache_lock_timeout), | |
289 NULL }, | |
276 | 290 |
277 #endif | 291 #endif |
278 | 292 |
279 { ngx_string("uwsgi_temp_path"), | 293 { ngx_string("uwsgi_temp_path"), |
280 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1234, | 294 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1234, |
1112 conf->upstream.cache = NGX_CONF_UNSET_PTR; | 1126 conf->upstream.cache = NGX_CONF_UNSET_PTR; |
1113 conf->upstream.cache_min_uses = NGX_CONF_UNSET_UINT; | 1127 conf->upstream.cache_min_uses = NGX_CONF_UNSET_UINT; |
1114 conf->upstream.cache_bypass = NGX_CONF_UNSET_PTR; | 1128 conf->upstream.cache_bypass = NGX_CONF_UNSET_PTR; |
1115 conf->upstream.no_cache = NGX_CONF_UNSET_PTR; | 1129 conf->upstream.no_cache = NGX_CONF_UNSET_PTR; |
1116 conf->upstream.cache_valid = NGX_CONF_UNSET_PTR; | 1130 conf->upstream.cache_valid = NGX_CONF_UNSET_PTR; |
1131 conf->upstream.cache_lock = NGX_CONF_UNSET; | |
1132 conf->upstream.cache_lock_timeout = NGX_CONF_UNSET_MSEC; | |
1117 #endif | 1133 #endif |
1118 | 1134 |
1119 conf->upstream.hide_headers = NGX_CONF_UNSET_PTR; | 1135 conf->upstream.hide_headers = NGX_CONF_UNSET_PTR; |
1120 conf->upstream.pass_headers = NGX_CONF_UNSET_PTR; | 1136 conf->upstream.pass_headers = NGX_CONF_UNSET_PTR; |
1121 | 1137 |
1338 prev->upstream.cache_valid, NULL); | 1354 prev->upstream.cache_valid, NULL); |
1339 | 1355 |
1340 if (conf->cache_key.value.data == NULL) { | 1356 if (conf->cache_key.value.data == NULL) { |
1341 conf->cache_key = prev->cache_key; | 1357 conf->cache_key = prev->cache_key; |
1342 } | 1358 } |
1359 | |
1360 ngx_conf_merge_value(conf->upstream.cache_lock, | |
1361 prev->upstream.cache_lock, 0); | |
1362 | |
1363 ngx_conf_merge_msec_value(conf->upstream.cache_lock_timeout, | |
1364 prev->upstream.cache_lock_timeout, 5000); | |
1343 | 1365 |
1344 #endif | 1366 #endif |
1345 | 1367 |
1346 ngx_conf_merge_value(conf->upstream.pass_request_headers, | 1368 ngx_conf_merge_value(conf->upstream.pass_request_headers, |
1347 prev->upstream.pass_request_headers, 1); | 1369 prev->upstream.pass_request_headers, 1); |