summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.travis.yml2
-rw-r--r--tests/travis/travis-ci-apache2
2 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index b0f482142..34a9f577e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,7 +33,7 @@ before_script:
- sudo a2enmod rewrite actions fastcgi alias
- sudo netstat -tulpn
- echo "cgi.fix_pathinfo = 1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
- - ~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm
+ - ~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm reload
- sudo cp -f tests/travis/travis-ci-apache /etc/apache2/sites-available/default
- sudo sed -e "s?%TRAVIS_BUILD_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/default
- sudo service apache2 restart
diff --git a/tests/travis/travis-ci-apache b/tests/travis/travis-ci-apache
index 3ffc2f988..5cfd3ccd0 100644
--- a/tests/travis/travis-ci-apache
+++ b/tests/travis/travis-ci-apache
@@ -13,7 +13,7 @@
AddHandler php5-fcgi .php
Action php5-fcgi /php5-fcgi
Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi
- FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9001 -pass-header Authorization
+ FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization
</IfModule>
</VirtualHost> \ No newline at end of file