com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS ext/standard/crypt.c
| From: | Stanislav Malyshev | Date: | Mon, 01 Dec 2014 05:39:49 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS ext/standard/crypt.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83428@lists.php.net to get a copy of this message | ||
Commit: 720ba679485cb7120911af8013b7b6ab72a47884
Author: Stanislav Malyshev <stas@php.net> Sun, 30 Nov 2014 21:39:26 -0800
Parents: 4675b79e65e7eea3f3e6343236e1c5ed335d88bf f7eedbe9a685d6047dc04b29121980c2c6773251
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=720ba679485cb7120911af8013b7b6ab72a47884
Log:
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
Changed paths:
MM NEWS
MM ext/standard/crypt.c
Diff:
diff --cc NEWS
index 492153b,16e0187..19b88d7
--- 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)