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