summaryrefslogtreecommitdiff
path: root/ext/openssl
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-5.6'Xinchen Hui2014-01-033-3/+3
|\
| * Bump yearXinchen Hui2014-01-033-3/+3
* | Eliminate another TSRMLS_FETCH() in i_zend_is_true()Kalle Sommer Nielsen2013-12-181-1/+1
|/
* Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2013-12-121-2/+2
|\
| * Fixed bug #65486 mysqli_poll() is broken on Win x64Anatol Belski2013-12-121-2/+2
* | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2013-12-111-1/+1
|\ \ | |/
| * Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2013-12-111-1/+1
| |\
| | * Merge branch 'PHP-5.3' into PHP-5.4Anatol Belski2013-12-111-1/+1
| | |\
| | | * fix dir separator in cve-2013-6420 testAnatol Belski2013-12-111-1/+1
* | | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2013-12-103-4/+61
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-12-103-4/+61
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.3' into PHP-5.4Stanislav Malyshev2013-12-103-4/+61
| | |\ \ | | | |/
| | | * Fix CVE-2013-6420 - memory corruption in openssl_x509_parseStanislav Malyshev2013-12-103-4/+61
* | | | Merge branch 'openssl_compile_warning_fix' of https://github.com/bukka/php-srcMichael Wallner2013-10-181-6/+4
|\ \ \ \
| * | | | Fix compiler warnings in openssl.cJakub Zelenka2013-10-131-6/+4
* | | | | previous revert killed that fileMichael Wallner2013-10-171-0/+33
* | | | | Merge branch 'updated_tls_support' of https://github.com/rdlowrey/php-srcMichael Wallner2013-10-174-2/+184
|\ \ \ \ \
| * | | | | Added support for TLSv1.1 and TLSv1.2Daniel Lowrey2013-10-084-1/+161
* | | | | | Merge branch 'PHP-5.5'Michael Wallner2013-10-175-217/+2
|\ \ \ \ \ \
| * | | | | | Revert "Added support for TLSv1.1 and TLSv1.2"Michael Wallner2013-10-175-217/+2
* | | | | | | fix wsMichael Wallner2013-10-171-5/+5
* | | | | | | Merge branch 'PHP-5.5'Michael Wallner2013-10-174-2/+161
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | |
| * | | | | Added support for TLSv1.1 and TLSv1.2Daniel Lowrey2013-10-175-2/+217
| | |/ / / | |/| | |
* | | | | Fixes broken zts build (recent openssl changes)Daniel Lowrey2013-10-121-10/+10
* | | | | C89Michael Wallner2013-10-091-1/+2
* | | | | Merge branch 'san_peer_matching' of https://github.com/rdlowrey/php-srcMichael Wallner2013-10-094-19/+161
|\ \ \ \ \
| * | | | | Changed return types to zend_bool, renamed testDaniel Lowrey2013-10-092-8/+11
| * | | | | Added SAN matching during peer verificationDaniel Lowrey2013-10-084-19/+158
| | |/ / / | |/| | |
* | | | | Merge branch 'PHP-5.5'Michael Wallner2013-10-091-12/+14
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'PHP-5.4' into PHP-5.5Michael Wallner2013-10-091-12/+14
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | C89 compatibilityMichael Wallner2013-10-091-12/+14
* | | | | Merge branch 'PHP-5.5'Michael Wallner2013-10-091-5/+6
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | Merge branch 'PHP-5.4' into PHP-5.5Michael Wallner2013-10-091-5/+6
| |\ \ \ | | |/ /
| | * | Fixed segfault when built with OpenSSL >= 1.0.1Daniel Lowrey2013-10-091-5/+6
* | | | Merge branch 'ssl-streams-crypto-method' of https://github.com/mj/php-srcMichael Wallner2013-10-083-1/+139
|\ \ \ \
| * | | | Add unit test that covers setting the crypto method.Martin Jansen2013-10-042-0/+110
| * | | | Streams for ssl:// transports can now be configured to use a specificMartin Jansen2013-09-211-1/+29
* | | | | Merge branch 'bug65729' of https://github.com/datibbaw/php-srcMichael Wallner2013-10-083-13/+115
|\ \ \ \ \
| * | | | | DNS name comparison is now case insensitive.datibbaw2013-10-082-4/+5
| * | | | | Use zend_bool as return value for _match()Tjerk Meesters2013-10-071-5/+2
| * | | | | Added two more test cases for CN matching.Tjerk Meesters2013-10-071-7/+18
| * | | | | yay, reduced one variableTjerk Meesters2013-09-211-4/+2
| * | | | | Fixed bug that would lead to out of bounds memory accessTjerk Meesters2013-09-211-18/+28
| * | | | | added better wildcard matching for CNTjerk Meesters2013-09-213-10/+95
| |/ / / /
* | | | | Using SUCCESS and FAILURE for return valuesdatibbaw2013-10-071-17/+17
* | | | | show method in error messageTjerk Meesters2013-09-301-1/+1
* | | | | Support string and array for peer fingerprint matchingdatibbaw2013-09-272-25/+82
* | | | | who put that stupid newline there?Tjerk Meesters2013-09-231-1/+0
* | | | | add md5 and sha1 fingerprint testsTjerk Meesters2013-09-232-19/+104
* | | | | Renamed to be more descriptive of what it doesTjerk Meesters2013-09-233-14/+14
View Lorry Controller Status