Mercurial > hg > nginx
comparison src/http/modules/ngx_http_flv_module.c @ 4494:13e09cf11d4e
Disable symlinks: initialization of the "disable_symlinks" field in
ngx_open_file_info_t moved to a separate function.
This is preparation for the "from=" parameter implementation of the
"disable_symlinks" directive.
author | Valentin Bartenev <vbart@nginx.com> |
---|---|
date | Mon, 27 Feb 2012 16:51:28 +0000 |
parents | 08713bac87fc |
children | 2b6cb7528409 |
comparison
equal
deleted
inserted
replaced
4493:47ece8818978 | 4494:13e09cf11d4e |
---|---|
107 of.directio = clcf->directio; | 107 of.directio = clcf->directio; |
108 of.valid = clcf->open_file_cache_valid; | 108 of.valid = clcf->open_file_cache_valid; |
109 of.min_uses = clcf->open_file_cache_min_uses; | 109 of.min_uses = clcf->open_file_cache_min_uses; |
110 of.errors = clcf->open_file_cache_errors; | 110 of.errors = clcf->open_file_cache_errors; |
111 of.events = clcf->open_file_cache_events; | 111 of.events = clcf->open_file_cache_events; |
112 #if (NGX_HAVE_OPENAT) | 112 |
113 of.disable_symlinks = clcf->disable_symlinks; | 113 if (ngx_http_set_disable_symlinks(r, clcf, &path, &of) != NGX_OK) { |
114 #endif | 114 return NGX_HTTP_INTERNAL_SERVER_ERROR; |
115 } | |
115 | 116 |
116 if (ngx_open_cached_file(clcf->open_file_cache, &path, &of, r->pool) | 117 if (ngx_open_cached_file(clcf->open_file_cache, &path, &of, r->pool) |
117 != NGX_OK) | 118 != NGX_OK) |
118 { | 119 { |
119 switch (of.err) { | 120 switch (of.err) { |