Mercurial > hg > nginx-vendor-current
comparison src/http/modules/ngx_http_index_module.c @ 664:f5b859b2f097 NGINX_1_1_16
nginx 1.1.16
*) Change: the simultaneous subrequest limit has been raised to 200.
*) Feature: the "from" parameter of the "disable_symlinks" directive.
*) Feature: the "return" and "error_page" directives can be used to
return 307 redirections.
*) Bugfix: a segmentation fault might occur in a worker process if the
"resolver" directive was used and there was no "error_log" directive
specified at global level.
Thanks to Roman Arutyunyan.
*) Bugfix: a segmentation fault might occur in a worker process if the
"proxy_http_version 1.1" or "fastcgi_keep_conn on" directives were
used.
*) Bugfix: memory leaks.
Thanks to Lanshun Zhou.
*) Bugfix: in the "disable_symlinks" directive.
*) Bugfix: on ZFS filesystem disk cache size might be calculated
incorrectly; the bug had appeared in 1.0.1.
*) Bugfix: nginx could not be built by the icc 12.1 compiler.
*) Bugfix: nginx could not be built by gcc on Solaris; the bug had
appeared in 1.1.15.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Wed, 29 Feb 2012 00:00:00 +0400 |
parents | e5fa0a4a7d27 |
children |
comparison
equal
deleted
inserted
replaced
663:dd668cf20818 | 664:f5b859b2f097 |
---|---|
60 NULL, /* init main configuration */ | 60 NULL, /* init main configuration */ |
61 | 61 |
62 NULL, /* create server configuration */ | 62 NULL, /* create server configuration */ |
63 NULL, /* merge server configuration */ | 63 NULL, /* merge server configuration */ |
64 | 64 |
65 ngx_http_index_create_loc_conf, /* create location configration */ | 65 ngx_http_index_create_loc_conf, /* create location configuration */ |
66 ngx_http_index_merge_loc_conf /* merge location configration */ | 66 ngx_http_index_merge_loc_conf /* merge location configuration */ |
67 }; | 67 }; |
68 | 68 |
69 | 69 |
70 ngx_module_t ngx_http_index_module = { | 70 ngx_module_t ngx_http_index_module = { |
71 NGX_MODULE_V1, | 71 NGX_MODULE_V1, |
207 of.valid = clcf->open_file_cache_valid; | 207 of.valid = clcf->open_file_cache_valid; |
208 of.min_uses = clcf->open_file_cache_min_uses; | 208 of.min_uses = clcf->open_file_cache_min_uses; |
209 of.test_only = 1; | 209 of.test_only = 1; |
210 of.errors = clcf->open_file_cache_errors; | 210 of.errors = clcf->open_file_cache_errors; |
211 of.events = clcf->open_file_cache_events; | 211 of.events = clcf->open_file_cache_events; |
212 #if (NGX_HAVE_OPENAT) | 212 |
213 of.disable_symlinks = clcf->disable_symlinks; | 213 if (ngx_http_set_disable_symlinks(r, clcf, &path, &of) != NGX_OK) { |
214 #endif | 214 return NGX_HTTP_INTERNAL_SERVER_ERROR; |
215 } | |
215 | 216 |
216 if (ngx_open_cached_file(clcf->open_file_cache, &path, &of, r->pool) | 217 if (ngx_open_cached_file(clcf->open_file_cache, &path, &of, r->pool) |
217 != NGX_OK) | 218 != NGX_OK) |
218 { | 219 { |
219 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, of.err, | 220 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, of.err, |
305 | 306 |
306 of.test_dir = 1; | 307 of.test_dir = 1; |
307 of.test_only = 1; | 308 of.test_only = 1; |
308 of.valid = clcf->open_file_cache_valid; | 309 of.valid = clcf->open_file_cache_valid; |
309 of.errors = clcf->open_file_cache_errors; | 310 of.errors = clcf->open_file_cache_errors; |
310 #if (NGX_HAVE_OPENAT) | 311 |
311 of.disable_symlinks = clcf->disable_symlinks; | 312 if (ngx_http_set_disable_symlinks(r, clcf, &dir, &of) != NGX_OK) { |
312 #endif | 313 return NGX_HTTP_INTERNAL_SERVER_ERROR; |
314 } | |
313 | 315 |
314 if (ngx_open_cached_file(clcf->open_file_cache, &dir, &of, r->pool) | 316 if (ngx_open_cached_file(clcf->open_file_cache, &dir, &of, r->pool) |
315 != NGX_OK) | 317 != NGX_OK) |
316 { | 318 { |
317 if (of.err) { | 319 if (of.err) { |