Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix CVE-2013-2110 - use correct formula to calculate string size

diff --cc NEWS
index 3d3b6c8cb8ded070d33438cbd12f8a10f21ec5db,371ec372381d3e0fe66faa1d9befd4541f6768ed..1523cbca2522204d97a2d3c3460183bf971ff8a7
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,24 -1,16 +1,28 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2013, PHP 5.4.17
 +?? ??? 2013, PHP 5.5.0 Release Candidate 3
 +
- -FPM:
++- Core:
++  . Fixed bug #64879 (Heap based buffer overflow in quoted_printable_encode,
++    CVE 2013-2110). (Stas)
+ 
+ - FPM:
    . Fixed Bug #64915 (error_log ignored when daemonize=0). (Remi)
  
 +- GD:
 +  . Fixed Bug #64961 (segfault in imagesetinterpolation). (Remi)
 +  . Fixed Bug #64962 (imagerotate produces corrupted image). (Remi)
 +
 +- Hash:
 +  . Fixed Bug #64745 (hash_pbkdf2() truncates data when using default length
 +    and hex output). (Anthony Ferrara)
 +
  - PDO_DBlib:
 -  . Fixed bug #63638 (Cannot connect to SQL Server 2008 with PDO dblib). 
 +  . Fixed bug #63638 (Cannot connect to SQL Server 2008 with PDO dblib).
      (Stanley Sufficool)
 -  . Fixed bug #64338 (pdo_dblib can't connect to Azure SQL). (Stanley 
 +  . Fixed bug #64338 (pdo_dblib can't connect to Azure SQL). (Stanley
      Sufficool)
 -  . Fixed bug #64808 (FreeTDS PDO getColumnMeta on a prepared but not executed 
 +  . Fixed bug #64808 (FreeTDS PDO getColumnMeta on a prepared but not executed
      statement crashes). (Stanley Sufficool)
  
  - PDO_pgsql: