summaryrefslogtreecommitdiff
path: root/sapi/phpdbg/phpdbg_prompt.c
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-06-06 08:59:05 +0200
committerAnatol Belski <ab@php.net>2014-06-06 08:59:05 +0200
commitd4cfc15514285d42f113facc1c296d32a818ccf2 (patch)
tree7e2485024280167e1057612e220eb6c636105dcd /sapi/phpdbg/phpdbg_prompt.c
parent4dc952b190dd4e9096aeb24acb7945fd25af6a52 (diff)
parent6a5d5d1db43e670427f83760afbdec3b28eab3d0 (diff)
downloadphp-git-d4cfc15514285d42f113facc1c296d32a818ccf2.tar.gz
Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6: (24 commits) drop exec perm on doc files fix test for 5.4/5.5 add test for previous fix NEWS NEWS NEWS Fix regression introduce in fix for bug #67118 update news update NEWS Fix tests Fix possible segfault depending on memory location... fix gcov data with some locales (again) fix gcov data with some locales (again) Update NEWS Fixed startup segfault in non-debug builds Fixes issue #87 Fixed regression introduced by patch for bug #67072 Fixed bug #67329 fileinfo: NULL pointer deference flaw by processing certain CDF files (re)add cve number in NEWS, from 5.4.29 NEWS NEWS ... Conflicts: ext/date/php_date.c
Diffstat (limited to 'sapi/phpdbg/phpdbg_prompt.c')
0 files changed, 0 insertions, 0 deletions