summaryrefslogtreecommitdiff
path: root/sapi/phpdbg/phpdbg_parser.c
diff options
context:
space:
mode:
authorMatteo Beccati <mbeccati@php.net>2014-06-09 07:07:07 +0200
committerMatteo Beccati <mbeccati@php.net>2014-06-09 07:07:07 +0200
commitaf5057bea7b6298e81621c7c0372028d2fc73037 (patch)
tree902d7795906ca1316df5d5907ac0f22c96db433d /sapi/phpdbg/phpdbg_parser.c
parent1b8d4695e2f18b83042e9ac5d501610fce1ccf57 (diff)
parent5c8c57aa6c340215961ac219f8d7d1c15be19566 (diff)
downloadphp-git-af5057bea7b6298e81621c7c0372028d2fc73037.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: 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