summaryrefslogtreecommitdiff
path: root/sapi/cli/php_cli_server.c
diff options
context:
space:
mode:
authorFerenc Kovacs <tyrael@php.net>2014-11-27 00:13:33 +0100
committerFerenc Kovacs <tyrael@php.net>2014-11-27 00:13:33 +0100
commitc0a4561fb434237699bbbdc733987e2954811e59 (patch)
tree63b9f07c16626cc7239a4e1245cd8a3b90954dbd /sapi/cli/php_cli_server.c
parentb5d341a70e40f11a64249151440ae8510e447ab4 (diff)
parentfcf21c4d00453f90b69894f1131ae505d92696ee (diff)
downloadphp-git-c0a4561fb434237699bbbdc733987e2954811e59.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: 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
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions