From: Stanislav Malyshev <stas@php.net>
Date: Tue, 17 Mar 2015 20:24:30 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.8RC1~68
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dbd1d79b68f443b3d13da3571f6f70ae3fbc0aa3;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  add NEWS
---

dbd1d79b68f443b3d13da3571f6f70ae3fbc0aa3
diff --cc NEWS
index ca0132313e,659d7a34b9..a047cada8e
--- a/NEWS
+++ b/NEWS
@@@ -5,7 -5,10 +5,8 @@@ PH
  - Core:
    . Fixed bug #66609 (php crashes with __get() and ++ operator in some cases).
      (Dmitry, Laruence)
 -  . Fixed bug #67626 (User exceptions not properly handled in streams). 
 -    (Julian)
    . Fixed bug #68917 (parse_url fails on some partial urls). (Wei Dai)
+   . Fixed bug #68976 (Use After Free Vulnerability in unserialize()). (Stas)
    . Fixed bug #69134 (Per Directory Values overrides PHP_INI_SYSTEM
      configuration options). (Anatol Belski)
    . Fixed bug #69207 (move_uploaded_file allows nulls in path). (Stas)