comparison src/http/modules/ngx_http_mp4_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 79aab5f5b201
comparison
equal deleted inserted replaced
4493:47ece8818978 4494:13e09cf11d4e
438 of.directio = NGX_MAX_OFF_T_VALUE; 438 of.directio = NGX_MAX_OFF_T_VALUE;
439 of.valid = clcf->open_file_cache_valid; 439 of.valid = clcf->open_file_cache_valid;
440 of.min_uses = clcf->open_file_cache_min_uses; 440 of.min_uses = clcf->open_file_cache_min_uses;
441 of.errors = clcf->open_file_cache_errors; 441 of.errors = clcf->open_file_cache_errors;
442 of.events = clcf->open_file_cache_events; 442 of.events = clcf->open_file_cache_events;
443 #if (NGX_HAVE_OPENAT) 443
444 of.disable_symlinks = clcf->disable_symlinks; 444 if (ngx_http_set_disable_symlinks(r, clcf, &path, &of) != NGX_OK) {
445 #endif 445 return NGX_HTTP_INTERNAL_SERVER_ERROR;
446 }
446 447
447 if (ngx_open_cached_file(clcf->open_file_cache, &path, &of, r->pool) 448 if (ngx_open_cached_file(clcf->open_file_cache, &path, &of, r->pool)
448 != NGX_OK) 449 != NGX_OK)
449 { 450 {
450 switch (of.err) { 451 switch (of.err) {