From 966c34d0ad4b64cbf5b35c815c310f24e68224fc Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 9 Nov 2015 10:08:52 +0100
Subject: [PATCH] [ticket/14271] Properly use try_files in nginx sample config

PHPBB3-14271
---
 phpBB/docs/nginx.sample.conf | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/phpBB/docs/nginx.sample.conf b/phpBB/docs/nginx.sample.conf
index 8b5fa6aa7b..2ead3552fd 100644
--- a/phpBB/docs/nginx.sample.conf
+++ b/phpBB/docs/nginx.sample.conf
@@ -61,13 +61,10 @@ http {
 
         root /path/to/phpbb;
 
-        # strip app.php/ prefix if it is present
-        rewrite ^/app\.php/?(.*)$ /$1 permanent;
-
         location / {
             # phpbb uses index.htm
             index index.php index.html index.htm;
-            try_files $uri @rewriteapp;
+            try_files $uri $uri/ @rewriteapp;
         }
 
         location @rewriteapp {
@@ -83,14 +80,15 @@ http {
         }
 
         # Pass the php scripts to fastcgi server specified in upstream declaration.
-        location ~ \.php {
+        location ~ \.php(/|$) {
             # Unmodified fastcgi_params from nginx distribution.
             include fastcgi_params;
             # Necessary for php.
             fastcgi_split_path_info ^(.+\.php)(/.*)$;
-            fastcgi_param PATHINFO $fastcgi_path_info;
+            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;
         }