summaryrefslogtreecommitdiff
path: root/ext/dom/entityreference.c
diff options
context:
space:
mode:
authorFerenc Kovacs <tyrael@php.net>2014-10-15 19:43:30 +0200
committerFerenc Kovacs <tyrael@php.net>2014-10-15 19:43:30 +0200
commitc03b6e1701caf5c0c7df9dbdd50f6fcc7db15e80 (patch)
treeae58060547609df086e9ca7beb2d74d6c2190473 /ext/dom/entityreference.c
parentd2ab6e1d15f58cb4f53c0a69c438c0721264455a (diff)
parentcfa1028d7e3942d6921d2c3ba5fba1be3ea78400 (diff)
downloadphp-git-c03b6e1701caf5c0c7df9dbdd50f6fcc7db15e80.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: NEWS Fixed Bug #65171 imagescale() fails Revert "Bug #41631: Observe socket read timeouts in SSL streams"
Diffstat (limited to 'ext/dom/entityreference.c')
0 files changed, 0 insertions, 0 deletions