Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | first shot remove TSRMLS_* things | Anatol Belski | 2014-12-13 | 2 | -464/+458 |
* | Merge branch 'PHP-5.6' | Stanislav Malyshev | 2014-11-30 | 1 | -30/+27 |
|\ | |||||
| * | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2014-11-30 | 5 | -5/+157 |
| |\ | |||||
| | * | Adds test cases for openssl EC improvements | Dominic Luechinger | 2014-11-30 | 5 | -7/+97 |
| | * | Adds better handling of EC keys: OPENSSL_KEYTYPE_EC | Dominic Luechinger | 2014-11-30 | 1 | -5/+70 |
| | * | Revert "Bug #41631: Observe socket read timeouts in SSL streams" | Julien Pauli | 2014-10-15 | 1 | -46/+0 |
* | | | Merge branch 'pull-request/916' | Stanislav Malyshev | 2014-11-30 | 5 | -2/+153 |
|\ \ \ | |||||
| * | | | Adds test cases for openssl EC improvements | Dominic Luechinger | 2014-11-24 | 4 | -0/+89 |
| * | | | Adds better handling of EC keys: OPENSSL_KEYTYPE_EC | Dominic Luechinger | 2014-11-24 | 1 | -2/+64 |
* | | | | Merge branch 'PHP-5.6' | Anatol Belski | 2014-11-28 | 1 | -0/+4 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | disable ext/openssl/tests/stream_server_reneg_limit.phpt for windows | Anatol Belski | 2014-11-28 | 1 | -0/+4 |
| * | | | Minor fix: Missing quotes in openssl test case for bug bug64802 | Dominic Luechinger | 2014-11-23 | 1 | -1/+1 |
* | | | | Minor fix: Missing quotes in openssl test case for bug bug64802 | Dominic Luechinger | 2014-11-23 | 1 | -1/+1 |
| |/ / |/| | | |||||
* | | | Merge branch 'PHP-5.6' | Ferenc Kovacs | 2014-10-15 | 1 | -61/+0 |
|\ \ \ | |/ / | |||||
| * | | Revert "Merge branch 'PHP-5.5' into PHP-5.6" | Ferenc Kovacs | 2014-10-15 | 1 | -46/+0 |
| * | | Revert "fix TS build" | Ferenc Kovacs | 2014-10-15 | 1 | -1/+1 |
| * | | Revert "Merge branch 'PHP-5.4' into PHP-5.5" | Ferenc Kovacs | 2014-10-15 | 1 | -13/+0 |
| * | | Revert "Bug #67965: Fix blocking behavior in non-blocking crypto streams" | Ferenc Kovacs | 2014-10-15 | 1 | -13/+11 |
| * | | Revert "Bug #41631: Fix regression from first attempt (6569db8)" | Ferenc Kovacs | 2014-10-15 | 1 | -1/+1 |
* | | | Merge branch 'PHP-5.6' | Tjerk Meesters | 2014-10-15 | 1 | -26/+30 |
|\ \ \ | |/ / | |||||
| * | | Fixed bug #68234 | Tjerk Meesters | 2014-10-15 | 1 | -26/+30 |
* | | | removed *.dsw and *.dsp files | Anatol Belski | 2014-09-28 | 1 | -111/+0 |
* | | | Merge branch 'PHP-5.6' | Ferenc Kovacs | 2014-09-24 | 1 | -21/+21 |
|\ \ \ | |/ / | |||||
| * | | update the certificate used for the test, as it expired recently | Ferenc Kovacs | 2014-09-24 | 1 | -21/+21 |
* | | | Merge branch 'PHP-5.6' | Remi Collet | 2014-09-24 | 2 | -3/+12 |
|\ \ \ | |/ / | |||||
| * | | Fix bug #68074 Allow to use system cipher list instead of hardcoded value | Remi Collet | 2014-09-24 | 2 | -3/+12 |
* | | | Move smart_str implementation into Zend/ | Nikita Popov | 2014-09-21 | 1 | -1/+1 |
* | | | Merge branch 'master' into issue-67910 | Florian MARGAINE | 2014-09-20 | 3 | -22/+24 |
|\ \ \ | |||||
| * | | | s/PHP 5/PHP 7/ | Johannes Schlüter | 2014-09-19 | 3 | -3/+3 |
| * | | | Fixed useless or duplicated IS_INTERNED() checks | Dmitry Stogov | 2014-09-19 | 1 | -7/+7 |
| * | | | Merge branch 'PHP-5.6' | Daniel Lowrey | 2014-09-09 | 1 | -12/+14 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch 'PHP-5.5' into PHP-5.6 | Daniel Lowrey | 2014-09-09 | 1 | -12/+14 |
| | |\ \ | | | |/ | |||||
| | | * | Merge branch 'PHP-5.4' into PHP-5.5 | Daniel Lowrey | 2014-09-09 | 1 | -12/+14 |
| | | |\ | |||||
| | | | * | Bug #41631: Fix regression from first attempt (6569db8) | Daniel Lowrey | 2014-09-09 | 1 | -1/+1 |
| | | | * | Bug #67965: Fix blocking behavior in non-blocking crypto streams | Daniel Lowrey | 2014-09-09 | 1 | -11/+13 |
* | | | | | Replaces php5 with php7, without whitespace changes. | Florian MARGAINE | 2014-09-20 | 2 | -3/+3 |
|/ / / / | |||||
* | | | | Fix compilation on systems without ecdh_curve | Johannes Schlüter | 2014-08-28 | 1 | -1/+2 |
* | | | | fix remaining 's' args for openssl | Anatol Belski | 2014-08-28 | 1 | -30/+54 |
* | | | | first show to make 's' work with size_t | Anatol Belski | 2014-08-27 | 1 | -40/+40 |
* | | | | Merge branch 'PHP-5.6' | Chris Wright | 2014-08-27 | 1 | -0/+13 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'PHP-5.5' into PHP-5.6 | Chris Wright | 2014-08-27 | 1 | -0/+13 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch 'PHP-5.4' into PHP-5.5 | Chris Wright | 2014-08-27 | 1 | -0/+13 |
| | |\ \ | | | |/ | |||||
| | | * | Fix stream_select() issue with OpenSSL buffer | Chris Wright | 2014-08-27 | 1 | -0/+13 |
* | | | | master renames phase 7PRE_AST_MERGE | Anatol Belski | 2014-08-25 | 1 | -4/+4 |
* | | | | master renames phase 6 | Anatol Belski | 2014-08-25 | 1 | -1/+1 |
* | | | | Merge branch 'master' of git.php.net:php-src | Anatol Belski | 2014-08-25 | 1 | -0/+11 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'PHP-5.6' | Daniel Lowrey | 2014-08-25 | 1 | -0/+11 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch 'PHP-5.5' into PHP-5.6 | Daniel Lowrey | 2014-08-25 | 1 | -0/+11 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Bug #67850: Build when OpenSSL compiled without SSLv3 support | Daniel Lowrey | 2014-08-25 | 1 | -0/+10 |
* | | | | | master renames phase 3 | Anatol Belski | 2014-08-25 | 1 | -1/+1 |