aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2017-10-31 15:47:09 +0100
committerMarc Alexander <admin@m-a-styles.de>2017-10-31 15:47:09 +0100
commit1744d829adad29bcfbfa01e7568960f081507b84 (patch)
tree2c9a57d56149192fe5993be53bb2c997152bcb86
parent78610f0406f9fe44f97fe9ee0d7b1750b4078e2d (diff)
parent8f97887683581555187caf6bfe4d1f21c5780341 (diff)
downloadforums-1744d829adad29bcfbfa01e7568960f081507b84.tar
forums-1744d829adad29bcfbfa01e7568960f081507b84.tar.gz
forums-1744d829adad29bcfbfa01e7568960f081507b84.tar.bz2
forums-1744d829adad29bcfbfa01e7568960f081507b84.tar.xz
forums-1744d829adad29bcfbfa01e7568960f081507b84.zip
Merge pull request #4978 from ftc2/3.2.x
[ticket/15385] nginx.sample.conf: www redirection, security regex
-rw-r--r--phpBB/docs/nginx.sample.conf10
1 files changed, 4 insertions, 6 deletions
diff --git a/phpBB/docs/nginx.sample.conf b/phpBB/docs/nginx.sample.conf
index ce929b6e54..55c01a1fc9 100644
--- a/phpBB/docs/nginx.sample.conf
+++ b/phpBB/docs/nginx.sample.conf
@@ -18,11 +18,11 @@ http {
gzip_vary on;
gzip_http_version 1.1;
gzip_min_length 700;
-
+
# Compression levels over 6 do not give an appreciable improvement
# in compression ratio, but take more resources.
gzip_comp_level 6;
-
+
# IE 6 and lower do not support gzip with Vary correctly.
gzip_disable "msie6";
# Before nginx 0.7.63:
@@ -49,9 +49,7 @@ http {
server_name myforums.com;
# A trick from http://wiki.nginx.org/Pitfalls#Taxing_Rewrites:
- rewrite ^ http://www.myforums.com$request_uri permanent;
- # Equivalent to:
- #rewrite ^(.*)$ http://www.myforums.com$1 permanent;
+ return 301 http://www.myforums.com$request_uri;
}
# The actual board domain.
@@ -72,7 +70,7 @@ http {
}
# Deny access to internal phpbb files.
- location ~ /(config\.php|common\.php|cache|files|images/avatars/upload|includes|phpbb|store|vendor) {
+ location ~ /(config\.php|common\.php|cache|files|images/avatars/upload|includes|(?<!ext/)phpbb|store|vendor) {
deny all;
# deny was ignored before 0.8.40 for connections over IPv6.
# Use internal directive to prohibit access on older versions.