summaryrefslogtreecommitdiff
path: root/sapi/cli/php_cli_server.c
diff options
context:
space:
mode:
authorRemi Collet <remi@php.net>2014-12-01 07:29:19 +0100
committerRemi Collet <remi@php.net>2014-12-01 07:29:19 +0100
commit4ba828652bac764988a9cbd726f92d245674dbca (patch)
treec27ede4eb14abddec3f4088477379930834244c5 /sapi/cli/php_cli_server.c
parent7efd03eadc5337a4c6a4a4d4c71dc82fea349f61 (diff)
parentcb1a297bf48bd1ef1183b25f046659aaf376688a (diff)
downloadphp-git-4ba828652bac764988a9cbd726f92d245674dbca.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: XFAIL as catch_workers_output = yes seems not reliable
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions