From: Daniel Lowrey <rdlowrey@php.net>
Date: Tue, 18 Feb 2014 00:38:30 +0000 (-0500)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.10RC1~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bd9aa181dc903a886ac76c45b11bf218948ee31b;p=php

Merge branch 'PHP-5.4' into PHP-5.5

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

bd9aa181dc903a886ac76c45b11bf218948ee31b
diff --cc ext/openssl/openssl.c
index 8ba24026b4,3e60cd505b..f1e582b20a
mode 100644,100755..100755
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c