diff options
| author |   robert <robert@openbsd.org> | 2012-05-13 09:14:58 +0000 |
|---|---|---|
| committer | robert <robert@openbsd.org> | 2012-05-13 09:14:58 +0000 |
| commit | 97af15d31a3e788ae1f3063c72204f69e2e38dde (patch) | |
| tree | 40613faa9ab41a3bffd46e7d418c97f022706db8 /usr.sbin/nginx/src/http/modules/ngx_http_mp4_module.c | |
| parent | Remove unused and confusing 'head' argument. (diff) | |
| download | wireguard-openbsd-97af15d31a3e788ae1f3063c72204f69e2e38dde.tar.xz wireguard-openbsd-97af15d31a3e788ae1f3063c72204f69e2e38dde.zip | |
update to nginx-1.2.0
Diffstat (limited to 'usr.sbin/nginx/src/http/modules/ngx_http_mp4_module.c')
| -rw-r--r-- | usr.sbin/nginx/src/http/modules/ngx_http_mp4_module.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/usr.sbin/nginx/src/http/modules/ngx_http_mp4_module.c b/usr.sbin/nginx/src/http/modules/ngx_http_mp4_module.c index 92dfbd4116a..433e118a227 100644 --- a/usr.sbin/nginx/src/http/modules/ngx_http_mp4_module.c +++ b/usr.sbin/nginx/src/http/modules/ngx_http_mp4_module.c @@ -442,6 +442,10 @@ ngx_http_mp4_handler(ngx_http_request_t *r) of.errors = clcf->open_file_cache_errors; of.events = clcf->open_file_cache_events; + if (ngx_http_set_disable_symlinks(r, clcf, &path, &of) != NGX_OK) { + return NGX_HTTP_INTERNAL_SERVER_ERROR; + } + if (ngx_open_cached_file(clcf->open_file_cache, &path, &of, r->pool) != NGX_OK) { @@ -459,6 +463,10 @@ ngx_http_mp4_handler(ngx_http_request_t *r) break; case NGX_EACCES: +#if (NGX_HAVE_OPENAT) + case NGX_EMLINK: + case NGX_ELOOP: +#endif level = NGX_LOG_ERR; rc = NGX_HTTP_FORBIDDEN; |