aboutsummaryrefslogtreecommitdiffstats
path: root/travis
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2013-09-02 23:40:11 +0200
committerAndreas Fischer <bantu@phpbb.com>2013-09-02 23:40:11 +0200
commitf9c3d78e8c4370141618a361a56403cd5103ec73 (patch)
tree4bf5b92a032412508786e1e4e0bd02e407cf3b15 /travis
parent5ddb0ba629e4b31ada931240c661d3f4c43d8676 (diff)
parentf446afa06b3642a24a548699b69c5b7bc4a35edb (diff)
downloadforums-f9c3d78e8c4370141618a361a56403cd5103ec73.tar
forums-f9c3d78e8c4370141618a361a56403cd5103ec73.tar.gz
forums-f9c3d78e8c4370141618a361a56403cd5103ec73.tar.bz2
forums-f9c3d78e8c4370141618a361a56403cd5103ec73.tar.xz
forums-f9c3d78e8c4370141618a361a56403cd5103ec73.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/11823] Set up nginx server to match PHP files with characters after .php
Diffstat (limited to 'travis')
-rwxr-xr-xtravis/setup-webserver.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/travis/setup-webserver.sh b/travis/setup-webserver.sh
index beb04b0fef..95fc4ec1f8 100755
--- a/travis/setup-webserver.sh
+++ b/travis/setup-webserver.sh
@@ -42,7 +42,7 @@ server {
root $PHPBB_ROOT_PATH/;
index index.php index.html;
- location ~ \.php$ {
+ location ~ \.php {
fastcgi_pass unix:$PHP_FPM_SOCK;
include fastcgi_params;
}