summaryrefslogtreecommitdiff
path: root/sapi/phpdbg/phpdbg_help.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2013-12-10 16:08:46 +0400
committerDmitry Stogov <dmitry@zend.com>2013-12-10 16:08:46 +0400
commit1e161a9c0fc215344998674401122f62077c47af (patch)
tree957ba26ae08785925a3b14161c9414d3591f6bc9 /sapi/phpdbg/phpdbg_help.c
parent4c3492b0507536418c606d5d53c043785c92175d (diff)
parenta46f644b3ac4abe7577165de4e4850e5c2c88227 (diff)
downloadphp-git-1e161a9c0fc215344998674401122f62077c47af.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: Revered func_get_args() changes, because they were not completly transparent and broke some tricky PHP code that worked because of luck before php-5.5.6 (see Bug #66107). The changes are going to be kept in PHP-5.6.
Diffstat (limited to 'sapi/phpdbg/phpdbg_help.c')
0 files changed, 0 insertions, 0 deletions