summaryrefslogtreecommitdiff
path: root/ext/openssl
Commit message (Expand)AuthorAgeFilesLines
* first shot remove TSRMLS_* thingsAnatol Belski2014-12-132-464/+458
* Merge branch 'PHP-5.6'Stanislav Malyshev2014-11-301-30/+27
|\
| * Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-11-305-5/+157
| |\
| | * Adds test cases for openssl EC improvementsDominic Luechinger2014-11-305-7/+97
| | * Adds better handling of EC keys: OPENSSL_KEYTYPE_ECDominic Luechinger2014-11-301-5/+70
| | * Revert "Bug #41631: Observe socket read timeouts in SSL streams"Julien Pauli2014-10-151-46/+0
* | | Merge branch 'pull-request/916'Stanislav Malyshev2014-11-305-2/+153
|\ \ \
| * | | Adds test cases for openssl EC improvementsDominic Luechinger2014-11-244-0/+89
| * | | Adds better handling of EC keys: OPENSSL_KEYTYPE_ECDominic Luechinger2014-11-241-2/+64
* | | | Merge branch 'PHP-5.6'Anatol Belski2014-11-281-0/+4
|\ \ \ \ | | |/ / | |/| |
| * | | disable ext/openssl/tests/stream_server_reneg_limit.phpt for windowsAnatol Belski2014-11-281-0/+4
| * | | Minor fix: Missing quotes in openssl test case for bug bug64802Dominic Luechinger2014-11-231-1/+1
* | | | Minor fix: Missing quotes in openssl test case for bug bug64802Dominic Luechinger2014-11-231-1/+1
| |/ / |/| |
* | | Merge branch 'PHP-5.6'Ferenc Kovacs2014-10-151-61/+0
|\ \ \ | |/ /
| * | Revert "Merge branch 'PHP-5.5' into PHP-5.6"Ferenc Kovacs2014-10-151-46/+0
| * | Revert "fix TS build"Ferenc Kovacs2014-10-151-1/+1
| * | Revert "Merge branch 'PHP-5.4' into PHP-5.5"Ferenc Kovacs2014-10-151-13/+0
| * | Revert "Bug #67965: Fix blocking behavior in non-blocking crypto streams"Ferenc Kovacs2014-10-151-13/+11
| * | Revert "Bug #41631: Fix regression from first attempt (6569db8)"Ferenc Kovacs2014-10-151-1/+1
* | | Merge branch 'PHP-5.6'Tjerk Meesters2014-10-151-26/+30
|\ \ \ | |/ /
| * | Fixed bug #68234Tjerk Meesters2014-10-151-26/+30
* | | removed *.dsw and *.dsp filesAnatol Belski2014-09-281-111/+0
* | | Merge branch 'PHP-5.6'Ferenc Kovacs2014-09-241-21/+21
|\ \ \ | |/ /
| * | update the certificate used for the test, as it expired recentlyFerenc Kovacs2014-09-241-21/+21
* | | Merge branch 'PHP-5.6'Remi Collet2014-09-242-3/+12
|\ \ \ | |/ /
| * | Fix bug #68074 Allow to use system cipher list instead of hardcoded valueRemi Collet2014-09-242-3/+12
* | | Move smart_str implementation into Zend/Nikita Popov2014-09-211-1/+1
* | | Merge branch 'master' into issue-67910Florian MARGAINE2014-09-203-22/+24
|\ \ \
| * | | s/PHP 5/PHP 7/Johannes Schlüter2014-09-193-3/+3
| * | | Fixed useless or duplicated IS_INTERNED() checksDmitry Stogov2014-09-191-7/+7
| * | | Merge branch 'PHP-5.6'Daniel Lowrey2014-09-091-12/+14
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.5' into PHP-5.6Daniel Lowrey2014-09-091-12/+14
| | |\ \ | | | |/
| | | * Merge branch 'PHP-5.4' into PHP-5.5Daniel Lowrey2014-09-091-12/+14
| | | |\
| | | | * Bug #41631: Fix regression from first attempt (6569db8)Daniel Lowrey2014-09-091-1/+1
| | | | * Bug #67965: Fix blocking behavior in non-blocking crypto streamsDaniel Lowrey2014-09-091-11/+13
* | | | | Replaces php5 with php7, without whitespace changes.Florian MARGAINE2014-09-202-3/+3
|/ / / /
* | | | Fix compilation on systems without ecdh_curveJohannes Schlüter2014-08-281-1/+2
* | | | fix remaining 's' args for opensslAnatol Belski2014-08-281-30/+54
* | | | first show to make 's' work with size_tAnatol Belski2014-08-271-40/+40
* | | | Merge branch 'PHP-5.6'Chris Wright2014-08-271-0/+13
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.5' into PHP-5.6Chris Wright2014-08-271-0/+13
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.4' into PHP-5.5Chris Wright2014-08-271-0/+13
| | |\ \ | | | |/
| | | * Fix stream_select() issue with OpenSSL bufferChris Wright2014-08-271-0/+13
* | | | master renames phase 7PRE_AST_MERGEAnatol Belski2014-08-251-4/+4
* | | | master renames phase 6Anatol Belski2014-08-251-1/+1
* | | | Merge branch 'master' of git.php.net:php-srcAnatol Belski2014-08-251-0/+11
|\ \ \ \
| * \ \ \ Merge branch 'PHP-5.6'Daniel Lowrey2014-08-251-0/+11
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Daniel Lowrey2014-08-251-0/+11
| | |\ \ \ | | | |/ /
| | | * | Bug #67850: Build when OpenSSL compiled without SSLv3 supportDaniel Lowrey2014-08-251-0/+10
* | | | | master renames phase 3Anatol Belski2014-08-251-1/+1