summaryrefslogtreecommitdiff
path: root/ext/openssl
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | 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
* | | | | master renames phase 1Anatol Belski2014-08-252-172/+172
|/ / / /
* | | | ported ext/opensslAnatol Belski2014-08-192-52/+53
* | | | Merge remote-tracking branch 'php/master'Anatol Belski2014-08-191-2/+2
|\ \ \ \
| * | | | fix wrong pointer indirectionAnatol Belski2014-08-191-2/+2
* | | | | basic macro replacements, all at onceAnatol Belski2014-08-192-91/+91
|/ / / /
* | | | cleanupDmitry Stogov2014-08-132-130/+108
* | | | cleanup (use zend_string* instead of char*)Dmitry Stogov2014-08-131-1/+0
* | | | Merge branch 'master' into testDmitry Stogov2014-08-111-0/+46
|\ \ \ \
| * \ \ \ Merge branch 'PHP-5.6'Anatol Belski2014-08-071-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-08-071-1/+1
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2014-08-071-1/+1
| | | |\ \ | | | | |/
| | | | * fix TS buildAnatol Belski2014-08-071-1/+1
| * | | | Merge branch 'PHP-5.6'Daniel Lowrey2014-08-071-0/+46
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Daniel Lowrey2014-08-071-0/+46
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'PHP-5.4' into PHP-5.5Daniel Lowrey2014-08-071-0/+46
| | | |\ \ | | | | |/
| | | | * Bug #41631: Observe socket read timeouts in SSL streamsDaniel Lowrey2014-08-071-0/+46
* | | | | Make stream->context indirect trough zend_resource (stream->ctx->ptr).Dmitry Stogov2014-08-071-28/+28
* | | | | Merge branch 'master' into phpngDmitry Stogov2014-08-043-56/+70
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'PHP-5.6'Tjerk Meesters2014-07-312-57/+57
| |\ \ \ \ | | |/ / /
| | * | | Moved streams related functions to xp_ssl.cTjerk Meesters2014-07-312-57/+57
| * | | | Merge branch 'PHP-5.6'Tjerk Meesters2014-07-291-2/+3
| |\ \ \ \ | | |/ / /
| | * | | Wildcards should only be used in the first name component; fixed comment styleTjerk Meesters2014-07-291-2/+3
| * | | | Merge branch 'PHP-5.6'Stanislav Malyshev2014-07-282-5/+18
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-07-282-5/+18
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-07-282-6/+19
| | | |\ \ | | | | |/
| | | | * Fix missing type checks in various functionsStanislav Malyshev2014-07-272-6/+19
| * | | | Merge branch 'PHP-5.6'Tjerk Meesters2014-07-241-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Fixed #67666 - Subject altName doesn't match wildcardsTjerk Meesters2014-07-241-1/+1
* | | | | Fixed potential memory leaksDmitry Stogov2014-07-221-1/+2
* | | | | ZVAL_STRINGL takes only three variablesLior Kaplan2014-07-221-1/+1
* | | | | Merge remote-tracking branch 'origin/master' into phpngXinchen Hui2014-07-181-2/+3
|\ \ \ \ \ | |/ / / /