Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'PHP-5.6' into PHP-7.0 | Lior Kaplan | 2016-01-01 | 1 | -1/+1 |
|\ | |||||
| * | Happy new year (Update copyright to 2016) | Lior Kaplan | 2016-01-01 | 1 | -1/+1 |
| * | Fixed bug #70718 stream_select() when OpenSSL extension is loaded on PHP Win64 | Anatol Belski | 2015-10-26 | 1 | -1/+1 |
* | | Fixed memory leak in php_stream_context_set_option() | Dmitry Stogov | 2015-10-29 | 1 | -2/+3 |
* | | remove TSRMLS_* | Anatol Belski | 2015-08-02 | 1 | -1/+1 |
* | | Use ZSTR_ API to access zend_string elements (this is just renaming without s... | Dmitry Stogov | 2015-06-30 | 1 | -4/+4 |
* | | Dropped CN_match and SNI_server_name context options | Nikita Popov | 2015-04-24 | 1 | -15/+2 |
* | | Merge branch 'PHP-5.6' | Daniel Lowrey | 2015-04-14 | 1 | -1/+6 |
|\ \ | |/ | |||||
| * | Fix Bug #69402: Reading empty SSL stream hangs until timeout | Daniel Lowrey | 2015-04-14 | 1 | -4/+9 |
* | | Fixed resource leak | Dmitry Stogov | 2015-04-08 | 1 | -0/+4 |
* | | Merge branch 'PHP-5.6' | Daniel Lowrey | 2015-03-11 | 1 | -11/+7 |
|\ \ | |/ | |||||
| * | Don't block on crypto data inside stream_select() | Daniel Lowrey | 2015-03-11 | 1 | -11/+7 |
* | | Merge branch 'PHP-5.6' | Daniel Lowrey | 2015-03-10 | 1 | -5/+12 |
|\ \ | |/ | |||||
| * | Fix bug# 69215 (Crypto servers should send client CA list) | Daniel Lowrey | 2015-03-10 | 1 | -5/+12 |
* | | Deprecate "session_meta_capture" SSL context option | Daniel Lowrey | 2015-03-09 | 1 | -1/+7 |
* | | Revert "Add stream_socket_crypto_info() function" | Daniel Lowrey | 2015-03-09 | 1 | -104/+0 |
* | | Add crypto info to stream_get_meta_data() result on encrypted streams | Daniel Lowrey | 2015-03-09 | 1 | -1/+52 |
* | | Merge branch 'PHP-5.6' | Daniel Lowrey | 2015-03-09 | 1 | -17/+18 |
|\ \ | |/ | |||||
| * | Merge branch 'PHP-5.5' into PHP-5.6 | Daniel Lowrey | 2015-03-09 | 1 | -18/+19 |
| |\ | |||||
| | * | Fix crypto stream timeout regressions | Daniel Lowrey | 2015-03-09 | 1 | -18/+19 |
* | | | fix data type | Anatol Belski | 2015-03-06 | 1 | -1/+1 |
* | | | Merge branch 'PHP-5.6' | Daniel Lowrey | 2015-03-05 | 1 | -1/+14 |
|\ \ \ | |/ / | |||||
| * | | Fix stream_select() issue with OpenSSL buffer | Chris Wright | 2015-03-05 | 1 | -1/+14 |
| * | | Really fix zts this time | Daniel Lowrey | 2015-03-05 | 1 | -4/+4 |
* | | | Merge branch 'PHP-5.6' | Daniel Lowrey | 2015-03-05 | 1 | -1/+2 |
|\ \ \ | |/ / | |||||
| * | | Fix ZTS | Daniel Lowrey | 2015-03-05 | 1 | -3/+3 |
* | | | Merge branch 'PHP-5.6' | Daniel Lowrey | 2015-03-04 | 1 | -1/+7 |
|\ \ \ | |/ / | |||||
| * | | Fixed bug #68265 (SAN match fails with trailing DNS dot) | Daniel Lowrey | 2015-03-04 | 1 | -1/+7 |
* | | | Merge branch 'PHP-5.6' | Daniel Lowrey | 2015-03-04 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.6' of https://github.com/bjori/php-src into PHP-5.6 | Daniel Lowrey | 2015-03-04 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | hexadecimal is case*in*sensitive | Hannes Magnusson | 2015-03-04 | 1 | -1/+1 |
* | | | | Merge branch 'PHP-5.6' | Daniel Lowrey | 2015-03-04 | 1 | -20/+31 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fixed bug #68879 (IP Address fields in subjectAltNames not used) | Daniel Lowrey | 2015-03-04 | 1 | -22/+33 |
| |/ / | |||||
* | | | Merge branch 'tls-alpn' | Daniel Lowrey | 2015-03-04 | 1 | -119/+362 |
|\ \ \ | |||||
| * | | | Misc updates/cleanup | Daniel Lowrey | 2015-03-04 | 1 | -106/+89 |
| * | | | Add TLS ALPN extension support in crypto client/server streams | Daniel Lowrey | 2015-02-28 | 1 | -0/+124 |
| * | | | Add stream_socket_crypto_info() function | Daniel Lowrey | 2015-02-28 | 1 | -0/+88 |
| * | | | Update for OpenSSL 1.0.2 compatibility | Daniel Lowrey | 2015-02-28 | 1 | -36/+84 |
* | | | | Merge branch 'PHP-5.6' | Daniel Lowrey | 2015-03-04 | 1 | -5/+17 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | Fixed bug #68920 (use strict peer_fingerprint input checks) | Daniel Lowrey | 2015-03-04 | 1 | -7/+22 |
* | | | Merge branch 'PHP-5.6' | Anatol Belski | 2015-02-13 | 1 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2015-02-13 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | fix condition | Anatol Belski | 2015-02-13 | 1 | -1/+1 |
* | | | Merge branch 'PHP-5.6' | Daniel Lowrey | 2015-02-09 | 1 | -16/+16 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.5' into PHP-5.6 | Daniel Lowrey | 2015-02-09 | 1 | -56/+167 |
| |\ \ | | |/ | |||||
| | * | Miscellaneous cleanup | Daniel Lowrey | 2015-02-09 | 1 | -28/+28 |
| | * | Update xp_ssl.c | Brad Broerman | 2015-02-04 | 1 | -2/+2 |
| | * | reneg and should_close are not yet members of sslsock. Removing... | Brad Broerman | 2015-01-28 | 1 | -9/+1 |
| | * | Updated with SSL fixes (backported from trunk) | Brad Broerman | 2015-01-28 | 1 | -45/+159 |
| | * | Bump year | Xinchen Hui | 2015-01-15 | 1 | -1/+1 |