com php-src: Merge branch 'PHP-5.4' into PHP-5.5: NEWS
| From: | Stanislav Malyshev | Date: | Fri, 15 Aug 2014 00:00:36 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: NEWS | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79877@lists.php.net to get a copy of this message | ||
Commit: 418563320788cb70c9319c3625669fea53afa295
Author: Stanislav Malyshev <stas@php.net> Thu, 14 Aug 2014 16:59:14 -0700
Parents: d1dd71454d4ff9b6207c3ab73893f54da62cc3cf ad492ca9327fc9f7f0ea7a0ddd32e62cdf0c9137
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=418563320788cb70c9319c3625669fea53afa295
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fixed glob() edge case on windows, ref bug #47358
- fix bug #47358, glob returns error, should be empty array()
Bugs:
https://bugs.php.net/47358
Changed paths:
MM NEWS
Diff:
diff --cc NEWS
index d731c35,a34ea04..ac3937a
--- a/NEWS
+++ b/NEWS
@@@ -1,7 -1,10 +1,10 @@@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2014, PHP 5.4.33
+?? ??? 2014, PHP 5..5.17
+ - Core:
+ . Fixed bug #47358 (glob returns error, should be empty array()). (Pierre)
+
- OpenSSL:
. Fixed bug #41631 (socket timeouts not honored in blocking SSL reads)
(Daniel Lowrey).