Merge branch 'master' into php5

* master:
  Extend segfault workaround to PHP versions below 5.4.
This commit is contained in:
Andreas Fischer 2014-04-12 07:23:32 +02:00
commit 003dcbb75e

View File

@ -15,7 +15,7 @@ else
fi
PHPUNIT_EXTRA_ARGS=''
if [ "$TRAVIS_PHP_VERSION" = '5.3.3' ]
if [ `php -r "echo (int) version_compare(PHP_VERSION, '5.4', '<');"` = "1" ]
then
PHPUNIT_EXTRA_ARGS="$PHPUNIT_EXTRA_ARGS -d zend.enable_gc=0"
fi