diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-12-02 19:18:57 +0100 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-12-02 19:18:57 +0100 |
| commit | 4d743eee5f01cfb5f93f05c85ed6d00dd4f7ba38 (patch) | |
| tree | 84104758c9558147eb38962d86e218c412180415 /Zend/zend_ini_parser.y | |
| parent | a0c03a3ec561842d39ac60a1575be08f3b83cfe1 (diff) | |
| parent | b28c3eb47ebe41947638bbdf24e3bcb563b25b66 (diff) | |
| download | php-git-4d743eee5f01cfb5f93f05c85ed6d00dd4f7ba38.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
make sure that we don't truncate the stack trace and cause false test failures when the test is executed in a directory with long path
Conflicts:
run-tests.php
Diffstat (limited to 'Zend/zend_ini_parser.y')
0 files changed, 0 insertions, 0 deletions