summaryrefslogtreecommitdiff
path: root/sapi/cli/php_cli_server.c
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-07-10 22:34:55 +0200
committerAnatol Belski <ab@php.net>2014-07-10 22:34:55 +0200
commitefcc789ef860742ca59db3723b3fad0e519d6461 (patch)
tree4e6ada6c7f69446f1925e3de6993e70ab6204720 /sapi/cli/php_cli_server.c
parentcc67cf6322178dfa38ddc3428c7ac5934db34cb4 (diff)
parent02b661ecfcc6ddfbeb75b8226690eac5786d6189 (diff)
downloadphp-git-efcc789ef860742ca59db3723b3fad0e519d6461.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: fix end of stream exception when generating makefile
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions