aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-12-04 21:11:40 +0100
committerMarc Alexander <admin@m-a-styles.de>2019-12-04 21:11:40 +0100
commitf9a364074d707b08bec00a7e25408d3a1094ec10 (patch)
tree985439bd5e473aedbbb39054bb959c4d079b4a9f
parentcb0f4790aeddc83cb46d5c5c2f3310d67c579b1b (diff)
parent3002cee42a922c0c90788aa9a8da5ad274773b6a (diff)
downloadforums-f9a364074d707b08bec00a7e25408d3a1094ec10.tar
forums-f9a364074d707b08bec00a7e25408d3a1094ec10.tar.gz
forums-f9a364074d707b08bec00a7e25408d3a1094ec10.tar.bz2
forums-f9a364074d707b08bec00a7e25408d3a1094ec10.tar.xz
forums-f9a364074d707b08bec00a7e25408d3a1094ec10.zip
Merge branch '3.2.x' into 3.3.x
-rw-r--r--phpBB/docs/nginx.sample.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/docs/nginx.sample.conf b/phpBB/docs/nginx.sample.conf
index 55c01a1fc9..848998cfeb 100644
--- a/phpBB/docs/nginx.sample.conf
+++ b/phpBB/docs/nginx.sample.conf
@@ -93,7 +93,7 @@ http {
# Correctly pass scripts for installer
location /install/ {
# phpBB uses index.htm
- try_files $uri $uri/ @rewrite_installapp;
+ try_files $uri $uri/ @rewrite_installapp =404;
# Pass the php scripts to fastcgi server specified in upstream declaration.
location ~ \.php(/|$) {
@@ -104,7 +104,7 @@ http {
fastcgi_param PATH_INFO $fastcgi_path_info;
fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
fastcgi_param DOCUMENT_ROOT $realpath_root;
- try_files $uri $uri/ /install/app.php$is_args$args;
+ try_files $uri $uri/ /install/app.php$is_args$args =404;
fastcgi_pass php;
}
}