com php-src: Merge branch 'PHP-5.6': ext/openssl/openssl.c ext/openssl/xp_ssl.c
| From: | Anatol Belski | Date: | Fri, 21 Feb 2014 22:14:48 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/openssl/openssl.c ext/openssl/xp_ssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76181@lists.php.net to get a copy of this message | ||
Commit: 38d02db86da7bb314cd921fbe5893b9faadc721e
Author: Anatol Belski <ab@php.net> Fri, 21 Feb 2014 23:14:48 +0100
Parents: a27db7d2daa9ded873f7589272a2d12d7f586f9d 5b6ef90bc0de63d2aa1f91d52b46021313aa18b5
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=38d02db86da7bb314cd921fbe5893b9faadc721e
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
fix linkage
More openssl UPGRADING updates
Fix build against older OpenSSL libs
Update NEWS/UPGRADING with openssl additions
Changed paths:
MM ext/openssl/openssl.c
MM ext/openssl/xp_ssl.c
Diff: