Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
* | | | | 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 |
* | | | | | master renames phase 1 | Anatol Belski | 2014-08-25 | 2 | -172/+172 |
|/ / / / | |||||
* | | | | ported ext/openssl | Anatol Belski | 2014-08-19 | 2 | -52/+53 |
* | | | | Merge remote-tracking branch 'php/master' | Anatol Belski | 2014-08-19 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | fix wrong pointer indirection | Anatol Belski | 2014-08-19 | 1 | -2/+2 |
* | | | | | basic macro replacements, all at once | Anatol Belski | 2014-08-19 | 2 | -91/+91 |
|/ / / / | |||||
* | | | | cleanup | Dmitry Stogov | 2014-08-13 | 2 | -130/+108 |
* | | | | cleanup (use zend_string* instead of char*) | Dmitry Stogov | 2014-08-13 | 1 | -1/+0 |
* | | | | Merge branch 'master' into test | Dmitry Stogov | 2014-08-11 | 1 | -0/+46 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'PHP-5.6' | Anatol Belski | 2014-08-07 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2014-08-07 | 1 | -1/+1 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge branch 'PHP-5.4' into PHP-5.5 | Anatol Belski | 2014-08-07 | 1 | -1/+1 |
| | | |\ \ | | | | |/ | |||||
| | | | * | fix TS build | Anatol Belski | 2014-08-07 | 1 | -1/+1 |
| * | | | | Merge branch 'PHP-5.6' | Daniel Lowrey | 2014-08-07 | 1 | -0/+46 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch 'PHP-5.5' into PHP-5.6 | Daniel Lowrey | 2014-08-07 | 1 | -0/+46 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge branch 'PHP-5.4' into PHP-5.5 | Daniel Lowrey | 2014-08-07 | 1 | -0/+46 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Bug #41631: Observe socket read timeouts in SSL streams | Daniel Lowrey | 2014-08-07 | 1 | -0/+46 |
* | | | | | Make stream->context indirect trough zend_resource (stream->ctx->ptr). | Dmitry Stogov | 2014-08-07 | 1 | -28/+28 |
* | | | | | Merge branch 'master' into phpng | Dmitry Stogov | 2014-08-04 | 3 | -56/+70 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch 'PHP-5.6' | Tjerk Meesters | 2014-07-31 | 2 | -57/+57 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Moved streams related functions to xp_ssl.c | Tjerk Meesters | 2014-07-31 | 2 | -57/+57 |
| * | | | | Merge branch 'PHP-5.6' | Tjerk Meesters | 2014-07-29 | 1 | -2/+3 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Wildcards should only be used in the first name component; fixed comment style | Tjerk Meesters | 2014-07-29 | 1 | -2/+3 |
| * | | | | Merge branch 'PHP-5.6' | Stanislav Malyshev | 2014-07-28 | 2 | -5/+18 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2014-07-28 | 2 | -5/+18 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-07-28 | 2 | -6/+19 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Fix missing type checks in various functions | Stanislav Malyshev | 2014-07-27 | 2 | -6/+19 |
| * | | | | Merge branch 'PHP-5.6' | Tjerk Meesters | 2014-07-24 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Fixed #67666 - Subject altName doesn't match wildcards | Tjerk Meesters | 2014-07-24 | 1 | -1/+1 |
* | | | | | Fixed potential memory leaks | Dmitry Stogov | 2014-07-22 | 1 | -1/+2 |
* | | | | | ZVAL_STRINGL takes only three variables | Lior Kaplan | 2014-07-22 | 1 | -1/+1 |
* | | | | | Merge remote-tracking branch 'origin/master' into phpng | Xinchen Hui | 2014-07-18 | 1 | -2/+3 |
|\ \ \ \ \ | |/ / / / |