From: Stanislav Malyshev <stas@php.net>
Date: Wed, 5 Jun 2013 04:59:51 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0RC3~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=785f4c5fc68422ae23c1acc37b823f214c52ca5d;p=php

Merge branch 'PHP-5.4' into PHP-5.5

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

785f4c5fc68422ae23c1acc37b823f214c52ca5d
diff --cc NEWS
index 3d3b6c8cb8,371ec37238..1523cbca25
--- a/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: