From: Daniel Lowrey <rdlowrey@php.net>
Date: Tue, 18 Feb 2014 00:38:49 +0000 (-0500)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha3~1^2~66
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4e4d319e6207e64d62a65c4238105f250cd13d0d;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed broken build when EC unavailable
---

4e4d319e6207e64d62a65c4238105f250cd13d0d
diff --cc ext/openssl/openssl.c
index 43682a67d6,f1e582b20a..31704e5254
mode 100644,100755..100755
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c