summaryrefslogtreecommitdiff
path: root/ext/openssl/xp_ssl.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-5.6' into PHP-7.0Lior Kaplan2016-01-011-1/+1
|\
| * Happy new year (Update copyright to 2016)Lior Kaplan2016-01-011-1/+1
| * Fixed bug #70718 stream_select() when OpenSSL extension is loaded on PHP Win64Anatol Belski2015-10-261-1/+1
* | Fixed memory leak in php_stream_context_set_option()Dmitry Stogov2015-10-291-2/+3
* | remove TSRMLS_*Anatol Belski2015-08-021-1/+1
* | Use ZSTR_ API to access zend_string elements (this is just renaming without s...Dmitry Stogov2015-06-301-4/+4
* | Dropped CN_match and SNI_server_name context optionsNikita Popov2015-04-241-15/+2
* | Merge branch 'PHP-5.6'Daniel Lowrey2015-04-141-1/+6
|\ \ | |/
| * Fix Bug #69402: Reading empty SSL stream hangs until timeoutDaniel Lowrey2015-04-141-4/+9
* | Fixed resource leakDmitry Stogov2015-04-081-0/+4
* | Merge branch 'PHP-5.6'Daniel Lowrey2015-03-111-11/+7
|\ \ | |/
| * Don't block on crypto data inside stream_select()Daniel Lowrey2015-03-111-11/+7
* | Merge branch 'PHP-5.6'Daniel Lowrey2015-03-101-5/+12
|\ \ | |/
| * Fix bug# 69215 (Crypto servers should send client CA list)Daniel Lowrey2015-03-101-5/+12
* | Deprecate "session_meta_capture" SSL context optionDaniel Lowrey2015-03-091-1/+7
* | Revert "Add stream_socket_crypto_info() function"Daniel Lowrey2015-03-091-104/+0
* | Add crypto info to stream_get_meta_data() result on encrypted streamsDaniel Lowrey2015-03-091-1/+52
* | Merge branch 'PHP-5.6'Daniel Lowrey2015-03-091-17/+18
|\ \ | |/
| * Merge branch 'PHP-5.5' into PHP-5.6Daniel Lowrey2015-03-091-18/+19
| |\
| | * Fix crypto stream timeout regressionsDaniel Lowrey2015-03-091-18/+19
* | | fix data typeAnatol Belski2015-03-061-1/+1
* | | Merge branch 'PHP-5.6'Daniel Lowrey2015-03-051-1/+14
|\ \ \ | |/ /
| * | Fix stream_select() issue with OpenSSL bufferChris Wright2015-03-051-1/+14
| * | Really fix zts this timeDaniel Lowrey2015-03-051-4/+4
* | | Merge branch 'PHP-5.6'Daniel Lowrey2015-03-051-1/+2
|\ \ \ | |/ /
| * | Fix ZTSDaniel Lowrey2015-03-051-3/+3
* | | Merge branch 'PHP-5.6'Daniel Lowrey2015-03-041-1/+7
|\ \ \ | |/ /
| * | Fixed bug #68265 (SAN match fails with trailing DNS dot)Daniel Lowrey2015-03-041-1/+7
* | | Merge branch 'PHP-5.6'Daniel Lowrey2015-03-041-1/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' of https://github.com/bjori/php-src into PHP-5.6Daniel Lowrey2015-03-041-1/+1
| |\ \
| | * | hexadecimal is case*in*sensitiveHannes Magnusson2015-03-041-1/+1
* | | | Merge branch 'PHP-5.6'Daniel Lowrey2015-03-041-20/+31
|\ \ \ \ | |/ / /
| * | | Fixed bug #68879 (IP Address fields in subjectAltNames not used)Daniel Lowrey2015-03-041-22/+33
| |/ /
* | | Merge branch 'tls-alpn'Daniel Lowrey2015-03-041-119/+362
|\ \ \
| * | | Misc updates/cleanupDaniel Lowrey2015-03-041-106/+89
| * | | Add TLS ALPN extension support in crypto client/server streamsDaniel Lowrey2015-02-281-0/+124
| * | | Add stream_socket_crypto_info() functionDaniel Lowrey2015-02-281-0/+88
| * | | Update for OpenSSL 1.0.2 compatibilityDaniel Lowrey2015-02-281-36/+84
* | | | Merge branch 'PHP-5.6'Daniel Lowrey2015-03-041-5/+17
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Fixed bug #68920 (use strict peer_fingerprint input checks)Daniel Lowrey2015-03-041-7/+22
* | | Merge branch 'PHP-5.6'Anatol Belski2015-02-131-2/+2
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2015-02-131-1/+1
| |\ \ | | |/
| | * fix conditionAnatol Belski2015-02-131-1/+1
* | | Merge branch 'PHP-5.6'Daniel Lowrey2015-02-091-16/+16
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.5' into PHP-5.6Daniel Lowrey2015-02-091-56/+167
| |\ \ | | |/
| | * Miscellaneous cleanupDaniel Lowrey2015-02-091-28/+28
| | * Update xp_ssl.cBrad Broerman2015-02-041-2/+2
| | * reneg and should_close are not yet members of sslsock. Removing...Brad Broerman2015-01-281-9/+1
| | * Updated with SSL fixes (backported from trunk)Brad Broerman2015-01-281-45/+159
| | * Bump yearXinchen Hui2015-01-151-1/+1