summaryrefslogtreecommitdiff
path: root/sapi/cli/php_cli_server.c
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2013-08-18 17:22:50 -0700
committerStanislav Malyshev <stas@php.net>2013-08-18 17:23:59 -0700
commitbcf785fb6667194ff70ef6f903189a495c15eb40 (patch)
tree00afe68e0bbef70956ed3b15388aeb76db09c576 /sapi/cli/php_cli_server.c
parentbd29ff7c38a14a0273329180c0e9f4d7a12e0d74 (diff)
parent14f5732096575f3c4ff0438e6650238370cb465c (diff)
downloadphp-git-bcf785fb6667194ff70ef6f903189a495c15eb40.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: Fix bug #65470 Segmentation fault in zend_error() with --enable-dtrace
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions