com php-src: Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport: ext/opens sl/openssl.c ext/openssl/xp_ssl.c
| From: | Anatol Belski | Date: | Fri, 21 Feb 2014 22:17:41 +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 ext/openssl/xp_ssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76182@lists.php.net to get a copy of this message | ||
Commit: 734d1b8e6fbef213d3b475c3872ebaae763da0c6
Author: Anatol Belski <ab@php.net> Fri, 21 Feb 2014 23:17:41 +0100
Parents: 90d31780c901a1cd5d9d22dbf89d72754e9d555a 5b6ef90bc0de63d2aa1f91d52b46021313aa18b5
Branches: str_size_and_int64_56_backport
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=734d1b8e6fbef213d3b475c3872ebaae763da0c6
Log:
Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
fix linkage
Changed paths:
MM ext/openssl/openssl.c
MM ext/openssl/xp_ssl.c
Diff:
diff --cc ext/openssl/openssl.c
index 7c79d6a,e649fca..d38f7d2
mode 100644,100755..100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c