com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS
| From: | Stanislav Malyshev | Date: | Mon, 17 Mar 2014 08:20:09 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76503@lists.php.net to get a copy of this message | ||
Commit: 2499b6518c4b0112c79295145d5f09d3658c31f4
Author: Stanislav Malyshev <stas@php.net> Mon, 17 Mar 2014 01:19:45 -0700
Parents: 7c904c6cbdc22476d2b42145044602c6d92c6a32 66bf216c66b36c3a5379368747f21470b4dd3d27
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2499b6518c4b0112c79295145d5f09d3658c31f4
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix bug #66873: check if obj->src is set
Bugs:
https://bugs.php.net/66873
Changed paths:
MM NEWS
Diff:
diff --cc NEWS
index 8860fb4,8a5cf73..c5fbb6c
--- a/NEWS
+++ b/NEWS
@@@ -28,9 -26,13 +28,13 @@@ PH
. Fixed bug #66893 (imagescale ignore method argument). (Remi)
- Hash:
- . hash_pbkdf2() now works correctly if the $length argument is not specified.
- (Nikita)
+ . Fixed bug #66698 (Missing FNV1a32 and FNV1a64 hash functions).
+ (Michael M Slusarz).
+ - Intl:
- . Fixed bug #66873 (A reproductible crash in UConverter when given invalid
++ . Fixed bug #66873 (A reproductible crash in UConverter when given invalid
+ encoding) (Stas)
+
- Mail:
. Fixed bug #66535 (Don't add newline after X-PHP-Originating-Script) (Tjerk)