Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Switch use of strtok() to gd_strtok_r()

diff --cc NEWS
index 7fd94e3dde1d1176c7586f913f04cbabf4166742,37d7de85dc35e2fe8d8b821196df1c730bff3224..4909a5d10b961f60a515a3302d1b8768f205c555
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,13 -1,32 +1,16 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2014, PHP 5.5.17
 +?? ??? 2014, PHP 5.6.0 ???
  
 -- Core:
 -  . Fixed bug #47358 (glob returns error, should be empty array()). (Pierre)
 -
 -- OpenSSL:
 -  . Fixed bug #41631 (socket timeouts not honored in blocking SSL reads).
 -    (Daniel Lowrey)
 -
 -- SPL:
 -  . Fixed bug #67813 (CachingIterator::__construct InvalidArgumentException
 -    wrong message). (tim_siebels_aurich at yahoo dot de)
 -
 -- Date:
 -  . Fixed bug #66091 (memory leaks in DateTime constructor). (Tjerk)
 -  . Fixed bug #66985 (Some timezones are no longer valid in PHP 5.5.10).
 -    (Derick)
 -  . Fixed bug #67109 (First uppercase letter breaks date string parsing).
 -    (Derick)
 +- Fileinfo:
 +  . Fixed bug #67716 (Segfault in cdf.c). (CVE-2014-3587) (Remi)
  
 -  . Made fontFetch's path parser thread-safe. (Sara).
+ - GD
 -?? ??? 2014, PHP 5.5.16
++  . Made fontFetch's path parser thread-safe. (Sara)
+ 
 +14 Aug 2014, PHP 5.6.0 Release Candidate 4
  
  - COM:
 -  . Fixed missing type checks in com_event_sink (Yussuf Khalil, Stas).
    . Fixed bug #41577 (DOTNET is successful once per server run)
      (Aidas Kasparas)
  

diff --cc ext/gd/libgd/gdft.c
Simple merge