com php-src: Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport: ext/opens sl/openssl.c
| From: | Anatol Belski | Date: | Fri, 14 Mar 2014 11:21:20 +0000 |
| Subject: | com php-src: Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport: ext/opens sl/openssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76498@lists.php.net to get a copy of this message | ||
Commit: 78fef11fe52fab912ca9fb1603bb78019c8db833
Author: Anatol Belski <ab@php.net> Fri, 14 Mar 2014 12:21:20 +0100
Parents: beac52a78bb2015a1f939c37f3624ac1b3fe53d5 8cde7473362ab6bb4efa1678221dd69281e6d9c5
Branches: str_size_and_int64_56_backport
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=78fef11fe52fab912ca9fb1603bb78019c8db833
Log:
Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
NEWS
NEWS
NEWS
Fixed Bug #66833 Default digest algo is still MD5
Fix 5.5.10 NEWS
Typo fix: sicret -> secret
Bugs:
https://bugs.php.net/66833
Changed paths:
MM ext/openssl/openssl.c
Diff:
diff --cc ext/openssl/openssl.c
index b580ee6,1781cc1..ca7d067
mode 100644,100755...100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c