com php-src: Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport: ext/opens sl/xp_ssl.c
| From: | Anatol Belski | Date: | Fri, 21 Feb 2014 20:55:21 +0000 |
| Subject: | com php-src: Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport: ext/opens sl/xp_ssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76183@lists.php.net to get a copy of this message | ||
Commit: 90d31780c901a1cd5d9d22dbf89d72754e9d555a
Author: Anatol Belski <ab@php.net> Fri, 21 Feb 2014 21:55:21 +0100
Parents: a4de08ea89afb601ea85cfa51ddaedf6ac386ae6 865a41a6a3f6b4cfc9d3e253d62bc5a3617cd6dd
Branches: str_size_and_int64_56_backport
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=90d31780c901a1cd5d9d22dbf89d72754e9d555a
Log:
Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
More openssl UPGRADING updates
Fix build against older OpenSSL libs
Update NEWS/UPGRADING with openssl additions
Changed paths:
MM ext/openssl/xp_ssl.c
Diff: