diff options
Diffstat (limited to 'travis/setup-webserver.sh')
| -rwxr-xr-x | travis/setup-webserver.sh | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/travis/setup-webserver.sh b/travis/setup-webserver.sh index 6188d2c232..ab045431cc 100755 --- a/travis/setup-webserver.sh +++ b/travis/setup-webserver.sh @@ -1,7 +1,12 @@ #!/bin/bash # -# @copyright (c) 2014 phpBB Group -# @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +# This file is part of the phpBB Forum Software package. +# +# @copyright (c) phpBB Limited <https://www.phpbb.com> +# @license GNU General Public License, version 2 (GPL-2.0) +# +# For full copyright and license information, please see +# the docs/CREDITS.txt file. # set -e set -x @@ -28,10 +33,6 @@ then # Upgrade to a recent stable version of HHVM sudo apt-get -o Dpkg::Options::="--force-confnew" install -y hhvm-nightly - # MySQLi is broken in HHVM 3.0.0~precise and still does not work for us in - # 2014.03.28~saucy, i.e. needs more work. Use MySQL extension for now. - sed -i "s/mysqli/mysql/" "$DIR/phpunit-mysql-travis.xml" - HHVM_LOG=$(realpath "$DIR")/hhvm.log sudo hhvm \ @@ -52,6 +53,7 @@ else user = $USER group = $USER listen = $APP_SOCK + listen.mode = 0666 pm = static pm.max_children = 2 @@ -70,8 +72,11 @@ echo " index index.php index.html; location ~ \.php { - fastcgi_pass unix:$APP_SOCK; - include fastcgi_params; + include fastcgi_params; + fastcgi_split_path_info ^(.+\.php)(/.*)$; + fastcgi_param PATH_INFO \$fastcgi_path_info; + fastcgi_param SCRIPT_FILENAME \$document_root\$fastcgi_script_name; + fastcgi_pass unix:$APP_SOCK; } } " | sudo tee $NGINX_CONF > /dev/null |