diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-03-25 11:46:15 +0100 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-03-25 11:46:15 +0100 |
| commit | 3eb6f7176ac44b5786379162fc73df3abd196646 (patch) | |
| tree | ae5106d10c1515588243a016fc089a98c71fd8e5 /phpBB | |
| parent | e873ed69449f4cbe0f055f0f9d25d0ef472fbc3a (diff) | |
| parent | 4e717c1725474265a694bd300b024030769dbd85 (diff) | |
| download | forums-3eb6f7176ac44b5786379162fc73df3abd196646.tar forums-3eb6f7176ac44b5786379162fc73df3abd196646.tar.gz forums-3eb6f7176ac44b5786379162fc73df3abd196646.tar.bz2 forums-3eb6f7176ac44b5786379162fc73df3abd196646.tar.xz forums-3eb6f7176ac44b5786379162fc73df3abd196646.zip | |
Merge pull request #4193 from marc1706/ticket/14497
[ticket/14497] Support second app.php script in install folder
* marc1706/ticket/14497:
[ticket/14497] Do not check for doctype on index and use correct return
[ticket/14497] Add test for visiting installer
[ticket/14497] Use nginx sample config in travis tests
[ticket/14497] Support second app.php script in install folder
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/nginx.sample.conf | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/phpBB/docs/nginx.sample.conf b/phpBB/docs/nginx.sample.conf index 2ead3552fd..c415720e9c 100644 --- a/phpBB/docs/nginx.sample.conf +++ b/phpBB/docs/nginx.sample.conf @@ -62,7 +62,7 @@ http { root /path/to/phpbb; location / { - # phpbb uses index.htm + # phpBB uses index.htm index index.php index.html index.htm; try_files $uri $uri/ @rewriteapp; } @@ -92,6 +92,29 @@ http { fastcgi_pass php; } + # Correctly pass scripts for installer + location /install/ { + # phpBB uses index.htm + try_files $uri $uri/ @rewrite_installapp; + + # Pass the php scripts to fastcgi server specified in upstream declaration. + 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/ /install/app.php$is_args$args; + fastcgi_pass php; + } + } + + location @rewrite_installapp { + rewrite ^(.*)$ /install/app.php/$1 last; + } + # Deny access to version control system directories. location ~ /\.svn|/\.git { deny all; |