summaryrefslogtreecommitdiff
path: root/sapi/cli/php_cli_server.c
diff options
context:
space:
mode:
authorChristopher Jones <sixd@php.net>2013-08-14 15:45:46 -0700
committerChristopher Jones <sixd@php.net>2013-08-14 15:45:46 -0700
commit8c61758dc772345636e436e3f69bef7323f8b339 (patch)
tree93eb470b73b402d972eba60e6aa32d735b73acc5 /sapi/cli/php_cli_server.c
parent2b9f5ac2525118bab372d5fc66eb19cabc46f483 (diff)
parent9d62807190ebda858acbb09ad832c96570a97c40 (diff)
downloadphp-git-8c61758dc772345636e436e3f69bef7323f8b339.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: Skip test if SKIP_ONLINE_TESTS set
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions