diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-05-18 21:17:31 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-05-18 21:17:31 +0400 |
| commit | b11a30f5eaeae2aa797ebef8722f4b1d51c72198 (patch) | |
| tree | 838d425afc9a07f00bd4e66e8df7709827c8c339 /.travis.yml | |
| parent | 583bb6339b03ac64ab38dee792e4aedeaa7d5f07 (diff) | |
| parent | 91c475fc0094fb23a8f94408684e0c21e195bf48 (diff) | |
| download | php-git-b11a30f5eaeae2aa797ebef8722f4b1d51c72198.tar.gz | |
Merge branch 'master' into phpng
* master:
Support for __debugInfo (Joe Watkins)
Optimize ZEND_POW (Rouven Weßling)
gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
Prevent recursion in ZF2 Parameters class
adding NEWS block for beta4
5.4.30 next
enable email notifications
update NEWS
update NEWS
update NEWS
- Updated to version 2014.3 (2014c)
fix bug #67253: timelib_meridian_with_check out-of-bounds read
Fix bug #67252: convert_uudecode out-of-bounds read
Fix bug #67251 - date_parse_from_format out-of-bounds read
Fix bug #67250 (iptcparse out-of-bounds read)
Conflicts:
ext/opcache/zend_persist.c
ext/spl/spl_array.c
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index f661807515..6973f480d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,8 @@ branches: - phpng notifications: - email: false + email: + on_failure: change env: global: |