com php-src: Merge branch 'bug-65538' of https://github.com/rdlowrey/php-src into PHP-5.6: ext/openssl/openssl.c
| From: | rdlowrey@php.net | Date: | Wed, 19 Feb 2014 11:17:33 +0000 |
| Subject: | com php-src: Merge branch 'bug-65538' of https://github.com/rdlowrey/php-src into PHP-5.6: ext/openssl/openssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76122@lists.php.net to get a copy of this message | ||
Commit: e272225e2a7b7725fdc9741a549ba428acca49e7
Author: Daniel Lowrey <rdlowrey@php.net> Wed, 19 Feb 2014 04:17:33 -0700
Parents: d9036d14f7eae2996b98e70fcb2dd5dbd40d3b5b 2a83295b14658dfac2f7733c03b941d184521889
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e272225e2a7b7725fdc9741a549ba428acca49e7
Log:
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)
Bugs:
https://bugs.php.net/65538
Changed paths:
MM ext/openssl/openssl.c
Diff:
diff --cc ext/openssl/openssl.c
index 1dc93e5,cf1a4c5..04d8b5e
mode 100755,100644..100755
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c