]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Tue, 27 May 2014 19:11:07 +0000 (12:11 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 27 May 2014 19:11:59 +0000 (12:11 -0700)
* PHP-5.5:
  update NEWS
  Fix bug #67249: printf out-of-bounds read
  5.5.13 release date

1  2 
NEWS

diff --cc NEWS
index 080e9c65b61f9a4e24ed223887d89a4f88be4e74,d37a9f17e4d881913da266d9d14ea347a7b390d5..82a1ce2af39669de00cea689efb6f9ba5ab1a675
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,7 -1,7 +1,10 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2014, PHP 5.5.14
 +?? ??? 2014, PHP 5.6.0 Beta 4
 +
++- Core:
++  . Fixed bug #67249 (printf out-of-bounds read). (Stas)
  - Date:
    . Fixed bug #67308 (Serialize of DateTime truncates fractions of second).
      (Adam)