diff options
author | Dmitry Stogov <dmitry@zend.com> | 2014-07-08 11:32:29 +0400 |
---|---|---|
committer | Dmitry Stogov <dmitry@zend.com> | 2014-07-08 11:32:29 +0400 |
commit | 8ce2f2caacc99c8a579ebfaa078ac9a063e2936f (patch) | |
tree | eeac185eb793b7a4e81d32ae4bbf84fb66b05246 /.travis.yml | |
parent | b36aaea6ede499589b3298e204095c292d025c34 (diff) | |
parent | 6e9bc95f6726f4d397d6f78e778f512b92b1b54b (diff) | |
download | php-git-8ce2f2caacc99c8a579ebfaa078ac9a063e2936f.tar.gz |
Merge branch 'master' into phpng
* master:
Fix still broken session test. Only return true/false.
Fixed bug #66830 (Empty header causes PHP built-in web server to hang).
Followup fix to custom session save handlers
create locales and re-add test
rm test for now
Conflicts:
ext/session/tests/session_set_save_handler_class_012.phpt
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 248ab861f8..d9e11a07d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,9 @@ notifications: email: on_failure: change +cache: + - apt + env: global: - MYSQL_TEST_HOST=127.0.0.1 @@ -28,6 +31,9 @@ env: before_install: - sudo apt-get update -qq - sudo apt-get install -y libenchant-dev libaspell-dev libpspell-dev librecode-dev + - sudo cp ./travis/de /var/lib/locales/supported.d/de + - sudo dpkg-reconfigure locales + before_script: # Compile PHP - ./travis/compile.sh |