Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix bug #64938: libxml_disable_entity_loader setting is shared between threads

diff --cc NEWS
index 6b3e14c8e91766c6e90d4f2d7deddcf04cd2cbdc,4e33fbd3db3f9204d55ac8b324cf91f6ec056b28..847ddd8765b3d6ebeb150e7e9830a875c094f0e7
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -26,9 -23,13 +26,13 @@@
    . Fixed bug #68571 (core dump when webserver close the socket).
      (redfoxli069 at gmail dot com, Laruence)
  
 -- Libxml:
++- LIBXML:
+   . Fixed bug #64938 (libxml_disable_entity_loader setting is shared
+     between threads). (Martin Jansen)
+ 
 -- OpenSSL:
 -  . Fixed bug #55618 (use case-insensitive cert name matching).
 -    (Daniel Lowrey)
 +- Opcache:
 +  . Fixed bug with try blocks being removed when extended_info opcode
 +    generation is turned on. (Laruence)
  
  - PDO_mysql:
    . Fixed bug #68750 (PDOMysql with mysqlnd does not allow the usage of

diff --cc ext/libxml/libxml.c
Simple merge