From: Stanislav Malyshev <stas@php.net>
Date: Mon, 1 Dec 2014 05:39:26 +0000 (-0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_NATIVE_TLS_MERGE~101^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=720ba679485cb7120911af8013b7b6ab72a47884;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update news
  update news
  update NEWS
  Apply error-code-salt fix to Windows too
  Bug fixes in light of failing bcrypt tests
  Add tests from 1.3. Add missing tests.
  Upgrade crypt_blowfish to version 1.3
  Apply error-code-salt fix to Windows too
  Bug fixes in light of failing bcrypt tests
  Add tests from 1.3. Add missing tests.
  Upgrade crypt_blowfish to version 1.3
---

720ba679485cb7120911af8013b7b6ab72a47884
diff --cc NEWS
index 492153bfc8,16e0187d7e..19b88d7d7d
--- a/NEWS
+++ b/NEWS
@@@ -1,15 -1,12 +1,16 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2014, PHP 5.5.21
 +?? ??? 2015, PHP 5.6.5
  
  - Core:
+   . Upgraded crypt_blowfish to version 1.3. (Leigh)
 -  . Fixed bug #60704 (unlink() bug with some files path). 
 +  . Fixed bug #60704 (unlink() bug with some files path).
    . Fixed bug #65419 (Inside trait, self::class != __CLASS__). (Julien)
  
 +- Date:
 +  . Implemented FR #68268 (DatePeriod: Getter for start date, end date and 
 +    interval). (Marc Bennewitz)
 +
  - mbstring:
    . Fixed bug #68504 (--with-libmbfl configure option not present on Windows).
      (Ashesh Vashi)