com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/openssl/openssl.c
| From: | rdlowrey@php.net | Date: | Tue, 18 Feb 2014 00:38:49 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/openssl/openssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76054@lists.php.net to get a copy of this message | ||
Commit: 4e4d319e6207e64d62a65c4238105f250cd13d0d
Author: Daniel Lowrey <rdlowrey@php.net> Mon, 17 Feb 2014 19:38:49 -0500
Parents: 3e59f041dab41dab10903a57e0953fe6028e02ab bd9aa181dc903a886ac76c45b11bf218948ee31b
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4e4d319e6207e64d62a65c4238105f250cd13d0d
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed broken build when EC unavailable
Changed paths:
MM ext/openssl/openssl.c
Diff:
diff --cc ext/openssl/openssl.c
index 43682a6,f1e582b..31704e5
mode 100644,100755..100755
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c