summaryrefslogtreecommitdiff
path: root/sapi/phpdbg/phpdbg_parser.c
diff options
context:
space:
mode:
authorMatteo Beccati <mbeccati@php.net>2014-06-09 07:07:17 +0200
committerMatteo Beccati <mbeccati@php.net>2014-06-09 07:07:17 +0200
commit6eaadc022818e22e204c0c52abf39134ee4b4612 (patch)
tree1ac3c23aa328d7d576509ca5ac2d4c361f4fb68a /sapi/phpdbg/phpdbg_parser.c
parentdf03bcf1352a4a0494a6a6d096de3c0eccbf7565 (diff)
parentaf5057bea7b6298e81621c7c0372028d2fc73037 (diff)
downloadphp-git-6eaadc022818e22e204c0c52abf39134ee4b4612.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: Fixed DOM tests when using libxml2 versions patched against CVE-2014-0191
Diffstat (limited to 'sapi/phpdbg/phpdbg_parser.c')
0 files changed, 0 insertions, 0 deletions