summaryrefslogtreecommitdiff
path: root/sapi/phpdbg/phpdbg_info.c
diff options
context:
space:
mode:
authorYasuo Ohgaki <yohgaki@php.net>2014-01-22 19:23:17 +0900
committerYasuo Ohgaki <yohgaki@php.net>2014-01-22 19:23:17 +0900
commit3cc6c6c587081178d4c68e9ee1bc021532598ff3 (patch)
treeb2b3ae26c24b5177aced74bd5e3ded20a99d88ad /sapi/phpdbg/phpdbg_info.c
parent26a2bed185a28c8228f72741ca2f5cc743401fb8 (diff)
parentfa224b1c58f7cea3632066cc86dcaa7b0cf74b24 (diff)
downloadphp-git-3cc6c6c587081178d4c68e9ee1bc021532598ff3.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: Fixed previous commit may delete unwanted cookies. Re-fixed bug #66469
Diffstat (limited to 'sapi/phpdbg/phpdbg_info.c')
0 files changed, 0 insertions, 0 deletions