Mercurial > hg > nginx-vendor-current

comparison src/http/modules/ngx_http_fastcgi_module.c @ 464:c8cfb6c462ef NGINX_0_7_44

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.7.44 *) Feature: the ngx_http_proxy_module preliminary cache support. *) Feature: the --with-pcre option in the configure. *) Feature: the "try_files" directive is now allowed on the server block level. *) Bugfix: the "try_files" directive handled incorrectly a query string in a fallback parameter. *) Bugfix: the "try_files" directive might test incorrectly directories. *) Bugfix: if there is the single server for given address:port pair, then captures in regular expressions in a "server_name" directive did not work.
author Igor Sysoev <http://sysoev.ru>
date Mon, 23 Mar 2009 00:00:00 +0300
parents 6281966854a5
children 9eda3153223b
comparison
equal deleted inserted replaced
463:51cb914e6d3a 464:c8cfb6c462ef
286 { ngx_string("fastcgi_temp_path"), 286 { ngx_string("fastcgi_temp_path"),
287 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1234, 287 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1234,
288 ngx_conf_set_path_slot, 288 ngx_conf_set_path_slot,
289 NGX_HTTP_LOC_CONF_OFFSET, 289 NGX_HTTP_LOC_CONF_OFFSET,
290 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.temp_path), 290 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.temp_path),
291 (void *) ngx_garbage_collector_temp_handler }, 291 NULL },
292 292
293 { ngx_string("fastcgi_max_temp_file_size"), 293 { ngx_string("fastcgi_max_temp_file_size"),
294 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, 294 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
295 ngx_conf_set_size_slot, 295 ngx_conf_set_size_slot,
296 NGX_HTTP_LOC_CONF_OFFSET, 296 NGX_HTTP_LOC_CONF_OFFSET,
431 ngx_string("X-Accel-Redirect"), 431 ngx_string("X-Accel-Redirect"),
432 ngx_string("X-Accel-Limit-Rate"), 432 ngx_string("X-Accel-Limit-Rate"),
433 ngx_string("X-Accel-Buffering"), 433 ngx_string("X-Accel-Buffering"),
434 ngx_string("X-Accel-Charset"), 434 ngx_string("X-Accel-Charset"),
435 ngx_null_string 435 ngx_null_string
436 };
437
438
439 static ngx_path_init_t ngx_http_fastcgi_temp_path = {
440 ngx_string(NGX_HTTP_FASTCGI_TEMP_PATH), { 1, 2, 0 }
436 }; 441 };
437 442
438 443
439 static ngx_int_t 444 static ngx_int_t
440 ngx_http_fastcgi_handler(ngx_http_request_t *r) 445 ngx_http_fastcgi_handler(ngx_http_request_t *r)
1921 if (conf->upstream.next_upstream & NGX_HTTP_UPSTREAM_FT_OFF) { 1926 if (conf->upstream.next_upstream & NGX_HTTP_UPSTREAM_FT_OFF) {
1922 conf->upstream.next_upstream = NGX_CONF_BITMASK_SET 1927 conf->upstream.next_upstream = NGX_CONF_BITMASK_SET
1923 |NGX_HTTP_UPSTREAM_FT_OFF; 1928 |NGX_HTTP_UPSTREAM_FT_OFF;
1924 } 1929 }
1925 1930
1926 ngx_conf_merge_path_value(conf->upstream.temp_path, 1931 if (ngx_conf_merge_path_value(cf, &conf->upstream.temp_path,
1927 prev->upstream.temp_path, 1932 prev->upstream.temp_path,
1928 NGX_HTTP_FASTCGI_TEMP_PATH, 1, 2, 0, 1933 &ngx_http_fastcgi_temp_path)
1929 ngx_garbage_collector_temp_handler, cf); 1934 != NGX_OK)
1935 {
1936 return NGX_CONF_ERROR;
1937 }
1930 1938
1931 ngx_conf_merge_value(conf->upstream.pass_request_headers, 1939 ngx_conf_merge_value(conf->upstream.pass_request_headers,
1932 prev->upstream.pass_request_headers, 1); 1940 prev->upstream.pass_request_headers, 1);
1933 ngx_conf_merge_value(conf->upstream.pass_request_body, 1941 ngx_conf_merge_value(conf->upstream.pass_request_body,
1934 prev->upstream.pass_request_body, 1); 1942 prev->upstream.pass_request_body, 1);