comparison src/http/modules/ngx_http_fastcgi_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
377 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE, 377 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE,
378 ngx_conf_set_bitmask_slot, 378 ngx_conf_set_bitmask_slot,
379 NGX_HTTP_LOC_CONF_OFFSET, 379 NGX_HTTP_LOC_CONF_OFFSET,
380 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.cache_methods), 380 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.cache_methods),
381 &ngx_http_upstream_cache_method_mask }, 381 &ngx_http_upstream_cache_method_mask },
382
383 { ngx_string("fastcgi_cache_lock"),
384 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
385 ngx_conf_set_flag_slot,
386 NGX_HTTP_LOC_CONF_OFFSET,
387 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.cache_lock),
388 NULL },
389
390 { ngx_string("fastcgi_cache_lock_timeout"),
391 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
392 ngx_conf_set_msec_slot,
393 NGX_HTTP_LOC_CONF_OFFSET,
394 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.cache_lock_timeout),
395 NULL },
382 396
383 #endif 397 #endif
384 398
385 { ngx_string("fastcgi_temp_path"), 399 { ngx_string("fastcgi_temp_path"),
386 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1234, 400 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1234,
2084 conf->upstream.cache = NGX_CONF_UNSET_PTR; 2098 conf->upstream.cache = NGX_CONF_UNSET_PTR;
2085 conf->upstream.cache_min_uses = NGX_CONF_UNSET_UINT; 2099 conf->upstream.cache_min_uses = NGX_CONF_UNSET_UINT;
2086 conf->upstream.cache_bypass = NGX_CONF_UNSET_PTR; 2100 conf->upstream.cache_bypass = NGX_CONF_UNSET_PTR;
2087 conf->upstream.no_cache = NGX_CONF_UNSET_PTR; 2101 conf->upstream.no_cache = NGX_CONF_UNSET_PTR;
2088 conf->upstream.cache_valid = NGX_CONF_UNSET_PTR; 2102 conf->upstream.cache_valid = NGX_CONF_UNSET_PTR;
2103 conf->upstream.cache_lock = NGX_CONF_UNSET;
2104 conf->upstream.cache_lock_timeout = NGX_CONF_UNSET_MSEC;
2089 #endif 2105 #endif
2090 2106
2091 conf->upstream.hide_headers = NGX_CONF_UNSET_PTR; 2107 conf->upstream.hide_headers = NGX_CONF_UNSET_PTR;
2092 conf->upstream.pass_headers = NGX_CONF_UNSET_PTR; 2108 conf->upstream.pass_headers = NGX_CONF_UNSET_PTR;
2093 2109
2320 prev->upstream.cache_valid, NULL); 2336 prev->upstream.cache_valid, NULL);
2321 2337
2322 if (conf->cache_key.value.data == NULL) { 2338 if (conf->cache_key.value.data == NULL) {
2323 conf->cache_key = prev->cache_key; 2339 conf->cache_key = prev->cache_key;
2324 } 2340 }
2341
2342 ngx_conf_merge_value(conf->upstream.cache_lock,
2343 prev->upstream.cache_lock, 0);
2344
2345 ngx_conf_merge_msec_value(conf->upstream.cache_lock_timeout,
2346 prev->upstream.cache_lock_timeout, 5000);
2325 2347
2326 #endif 2348 #endif
2327 2349
2328 ngx_conf_merge_value(conf->upstream.pass_request_headers, 2350 ngx_conf_merge_value(conf->upstream.pass_request_headers,
2329 prev->upstream.pass_request_headers, 1); 2351 prev->upstream.pass_request_headers, 1);