summaryrefslogtreecommitdiff
path: root/ext/xml/php_xml.h
diff options
context:
space:
mode:
authorkrakjoe <joe.watkins@live.co.uk>2014-01-01 13:01:06 +0000
committerkrakjoe <joe.watkins@live.co.uk>2014-01-01 13:01:06 +0000
commit8a7e2f8dd2116ff6ada654e301c593accf337250 (patch)
tree584f1654fdb4b03f41416657ce0886f928122fc2 /ext/xml/php_xml.h
parent37897e258d13016f80c61b7d6e9054994f2e5e0f (diff)
parente9195018dcb19eca3964efb3cc262e63b100ba3e (diff)
downloadphp-git-8a7e2f8dd2116ff6ada654e301c593accf337250.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: fix #66375 bad logic in sapi header callback routine
Diffstat (limited to 'ext/xml/php_xml.h')
0 files changed, 0 insertions, 0 deletions