Mercurial > hg > nginx
diff src/http/ngx_http_core_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 | d11f86a16e3b |
children | b4379a91f9b5 |
line wrap: on
line diff
--- a/src/http/ngx_http_core_module.c Mon Feb 27 16:46:57 2012 +0000 +++ b/src/http/ngx_http_core_module.c Mon Feb 27 16:51:28 2012 +0000 @@ -1320,9 +1320,11 @@ of.test_only = 1; of.errors = clcf->open_file_cache_errors; of.events = clcf->open_file_cache_events; -#if (NGX_HAVE_OPENAT) - of.disable_symlinks = clcf->disable_symlinks; -#endif + + if (ngx_http_set_disable_symlinks(r, clcf, &path, &of) != NGX_OK) { + ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); + return NGX_OK; + } if (ngx_open_cached_file(clcf->open_file_cache, &path, &of, r->pool) != NGX_OK) @@ -2645,6 +2647,18 @@ } +ngx_int_t +ngx_http_set_disable_symlinks(ngx_http_request_t *r, + ngx_http_core_loc_conf_t *clcf, ngx_str_t *path, ngx_open_file_info_t *of) +{ +#if (NGX_HAVE_OPENAT) + of->disable_symlinks = clcf->disable_symlinks; +#endif + + return NGX_OK; +} + + static char * ngx_http_core_server(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy) {