summaryrefslogtreecommitdiff
path: root/sapi/cli/php_cli_server.c
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2014-06-10 23:20:07 -0700
committerStanislav Malyshev <stas@php.net>2014-06-10 23:20:07 -0700
commit2ed66ed21c6258683084b209ca3da1dfef5370a1 (patch)
tree2743850d9e1f005fe5b2d1b3396648a84caadb08 /sapi/cli/php_cli_server.c
parentebe6854dbc1c61b303f5adbec712741b1bdcae70 (diff)
parentf11bba492978cc83cbe731788942a312c77418c1 (diff)
downloadphp-git-2ed66ed21c6258683084b209ca3da1dfef5370a1.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: Fix bug #66127 (Segmentation fault with ArrayObject unset) 5.4.31 next
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions