Commit:    785f4c5fc68422ae23c1acc37b823f214c52ca5d
Author:    Stanislav Malyshev <s...@php.net>         Tue, 4 Jun 2013 21:59:51 
-0700
Parents:   74e52eaea9c9d030dd70cf915b6f506065741dca 
efdeec3c0eb8e1bd9d14af37be6979fb46eda5df
Branches:  PHP-5.5

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=785f4c5fc68422ae23c1acc37b823f214c52ca5d

Log:
Merge branch 'PHP-5.4' into PHP-5.5

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

Changed paths:
  MM  NEWS


Diff:
diff --cc NEWS
index 3d3b6c8,371ec37..1523cbc
--- 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:


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to