From: Daniel Lowrey <rdlowrey@php.net>
Date: Wed, 19 Feb 2014 11:17:33 +0000 (-0700)
Subject: Merge branch 'bug-65538' of https://github.com/rdlowrey/php-src into PHP-5.6
X-Git-Tag: php-5.6.0alpha3~1^2~53
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e272225e2a7b7725fdc9741a549ba428acca49e7;p=php

Merge branch 'bug-65538' of https://github.com/rdlowrey/php-src into PHP-5.6

* 'bug-65538' of https://github.com/rdlowrey/php-src:
  Add tests for Bug #65538
  Fix Bug #65538 (cafile now supports stream wrappers)
---

e272225e2a7b7725fdc9741a549ba428acca49e7
diff --cc ext/openssl/openssl.c
index 1dc93e5078,cf1a4c5464..04d8b5ea23
mode 100755,100644..100755
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c