Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Add mitigation for CVE-2015-0235 (bug #68925)
  Add mitigation for CVE-2015-0235 (bug #68925)

diff --cc NEWS
index 3533fb00ad2dd4877d1c2036defe7004894fbe06,88ca5ee6182752d769858570a3ceb54eb1bfd4fc..6b9e21525cb54bff7c1737714c55594fed2885a0
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,7 -1,16 +1,11 @@@
 -PHP                                                                        NEWS
 +PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2015, PHP 5.5.22
 +?? Feb 2015, PHP 5.6.6
  
 -- Date:
 -  . Fixed bug #45081 (strtotime incorrectly interprets SGT time zone). (Derick)
 -  . Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat).
 -    (Derick, Felipe)
 -
+ - Core:
+   . Fixed bug #68925 (Mitigation for CVE-2015-0235 – GHOST: glibc gethostbyname
+     buffer overflow). (Stas)
+ 
  - Dba:
    . Fixed bug #68711 (useless comparisons). (bugreports at internot dot info)
  

diff --cc ext/standard/string.c
Simple merge