aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs
diff options
context:
space:
mode:
authorTristan Darricau <tristan.darricau@sensiolabs.com>2015-12-08 19:48:12 +0100
committerTristan Darricau <tristan.darricau@sensiolabs.com>2015-12-08 19:48:12 +0100
commit4bcec475fe64468526475b728726f57739eddeec (patch)
tree8977ca3e0ad4413f37d974f71102effe51ceed6b /phpBB/docs
parent8ef8f49c9a98a33f811869986623bcfb2f592aae (diff)
parent901785bc5ee46634fcbbb839b95932f13c80253a (diff)
downloadforums-4bcec475fe64468526475b728726f57739eddeec.tar
forums-4bcec475fe64468526475b728726f57739eddeec.tar.gz
forums-4bcec475fe64468526475b728726f57739eddeec.tar.bz2
forums-4bcec475fe64468526475b728726f57739eddeec.tar.xz
forums-4bcec475fe64468526475b728726f57739eddeec.zip
Merge branch '3.1.x'
* 3.1.x: [ticket/14271] Properly use try_files in nginx sample config [ticket/14271] Improve try_files and use split path info [ticket/14271] Update sample config
Diffstat (limited to 'phpBB/docs')
-rw-r--r--phpBB/docs/nginx.sample.conf17
1 files changed, 13 insertions, 4 deletions
diff --git a/phpBB/docs/nginx.sample.conf b/phpBB/docs/nginx.sample.conf
index c82f5c8e49..2ead3552fd 100644
--- a/phpBB/docs/nginx.sample.conf
+++ b/phpBB/docs/nginx.sample.conf
@@ -64,6 +64,11 @@ http {
location / {
# phpbb uses index.htm
index index.php index.html index.htm;
+ try_files $uri $uri/ @rewriteapp;
+ }
+
+ location @rewriteapp {
+ rewrite ^(.*)$ /app.php/$1 last;
}
# Deny access to internal phpbb files.
@@ -75,12 +80,16 @@ http {
}
# Pass the php scripts to fastcgi server specified in upstream declaration.
- location ~ \.php$ {
- fastcgi_pass php;
- # Necessary for php.
- fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+ location ~ \.php(/|$) {
# Unmodified fastcgi_params from nginx distribution.
include fastcgi_params;
+ # Necessary for php.
+ fastcgi_split_path_info ^(.+\.php)(/.*)$;
+ 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/ /app.php$is_args$args;
+ fastcgi_pass php;
}
# Deny access to version control system directories.