com php-src: Merge branch 'PHP-5.6': ext/openssl/openssl.c
| From: | rdlowrey@php.net | Date: | Tue, 25 Feb 2014 20:27:10 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/openssl/openssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76214@lists.php.net to get a copy of this message | ||
Commit: 33914b51664aaa6f708b445f0d92507e288d8ac4
Author: Daniel Lowrey <rdlowrey@php.net> Tue, 25 Feb 2014 13:27:10 -0700
Parents: ee2d5776fafff70a8149aa2050ded2f1397b6847 781d0b9ee3e950a44683fb2a2f2b427aa73e1292
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=33914b51664aaa6f708b445f0d92507e288d8ac4
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
Remove test case invalidated by openssl.cafile accessibility change
Tolerate non-standard newlines when parsing stream CA files
Remove openssl tests that shouldn't have survived last merge
Add openssl.cafile ini check when loading cainfo
Change openssl directives to PHP_INI_PERDIR
Update openssl tests with new server/client test harness
Add peer certificate verification on windows
Changed paths:
MM ext/openssl/openssl.c
Diff: