com php-src: Merge remote-tracking branch 'origin/str_size _and_int64_56_backport' into str_size _and_int64: ext/openssl/openssl.c ext/openssl/x
p_ssl.c
| From: | Anatol Belski | Date: | Fri, 21 Feb 2014 22:22:02 +0000 |
| Subject: | com php-src: Merge remote-tracking branch 'origin/str_size _and_int64_56_backport' into str_size _and_int64: ext/openssl/openssl.c ext/openssl/x p_ssl.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76186@lists.php.net to get a copy of this message | ||
Commit: 592a73fbca6c1e56ae1ff363709a4c59e6dd72e1
Author: Anatol Belski <ab@php.net> Fri, 21 Feb 2014 23:22:02 +0100
Parents: 76e711fe598a56717eaa1759e18c583dbbfaff9a 734d1b8e6fbef213d3b475c3872ebaae763da0c6
Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=592a73fbca6c1e56ae1ff363709a4c59e6dd72e1
Log:
Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into
str_size_and_int64
* origin/str_size_and_int64_56_backport:
fix linkage
More openssl UPGRADING updates
Fix build against older OpenSSL libs
Update NEWS/UPGRADING with openssl additions
fix macro names
Conflicts:
NEWS
UPGRADING
Changed paths:
MM ext/openssl/openssl.c
MM ext/openssl/xp_ssl.c
Diff: