]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c552629 de31324)
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Sun, 1 Feb 2015 08:08:46 +0000 (00:08 -0800)
committerStanislav Malyshev <stas@php.net>
Sun, 1 Feb 2015 08:09:04 +0000 (00:09 -0800)
commit463611714c7a9a91ed190802ede60068593f8495
treeabd8eee99cab7c95fd079ab52d9608724128490ctree | snapshot
parentc5526291cedcb6b5c48d6f13cc7481f8eea9761acommit | diff
parentde31324c221c1791b26350ba106cc26bad23ace9commit | diff
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix bug #64938: libxml_disable_entity_loader setting is shared between threads
NEWS diff1 | diff2 | blob | history
ext/libxml/libxml.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.