diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-11-27 00:13:11 +0100 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-11-27 00:13:11 +0100 |
| commit | fcf21c4d00453f90b69894f1131ae505d92696ee (patch) | |
| tree | 68644c738a32ae159cb274d3e956736dd8976728 /sapi/cli/php_cli_server.c | |
| parent | 543ad4b2d3f000510769d0d739ef129c792c1e24 (diff) | |
| parent | 5d67e8617b5d0bf9015bb8ea4df570e19aed89de (diff) | |
| download | php-git-fcf21c4d00453f90b69894f1131ae505d92696ee.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
the darwin specific test fails for me with the same output which is the expected for the original test I couldn't find anybody who managed to see this test passing, but I found a bunch of other reports on qa.php.net/reports and on google which do see this test failing on mac. if this change causes you to have this test failing on Mac, please drop me a mail so we can improve the current test so it passes for everybody.
5.5.21 now
Conflicts:
configure.in
main/php_version.h
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions