aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2011-01-26 05:45:45 -0500
committerOleg Pudeyev <oleg@bsdpower.com>2011-01-26 05:45:45 -0500
commit9716cceb1baf01764d96eef2500994b3a83ed7ef (patch)
treea8f1a11add4ed8e1740d0629787935d3c5e50d5a
parent10169d1c3e6c68f596bb03acb3b6389eb6056804 (diff)
parentafc856417f89114d7ea56eb0b290f7604dba0d6b (diff)
downloadforums-9716cceb1baf01764d96eef2500994b3a83ed7ef.tar
forums-9716cceb1baf01764d96eef2500994b3a83ed7ef.tar.gz
forums-9716cceb1baf01764d96eef2500994b3a83ed7ef.tar.bz2
forums-9716cceb1baf01764d96eef2500994b3a83ed7ef.tar.xz
forums-9716cceb1baf01764d96eef2500994b3a83ed7ef.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/10007] Add directive 'internal' to blocked folders in nginx config.
-rw-r--r--phpBB/docs/nginx.sample.conf2
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/docs/nginx.sample.conf b/phpBB/docs/nginx.sample.conf
index f74e988922..54a5c316ca 100644
--- a/phpBB/docs/nginx.sample.conf
+++ b/phpBB/docs/nginx.sample.conf
@@ -53,6 +53,7 @@ http {
# Deny access to internal phpbb files.
location ~ /(config\.php|common\.php|includes|cache|files|store|images/avatars/upload) {
+ internal;
deny all;
}
@@ -67,6 +68,7 @@ http {
# Deny access to version control system directories.
location ~ /\.svn|/\.git {
+ internal;
deny all;
}
}