Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'PHP-5.6' | Tjerk Meesters | 2014-03-07 | 2 | -1/+7 |
|\ | |||||
| * | Merge branch 'PHP-5.5' into PHP-5.6 | Tjerk Meesters | 2014-03-07 | 2 | -1/+7 |
| |\ | |||||
| | * | Fixed null termination | Tjerk Meesters | 2014-03-07 | 2 | -1/+7 |
* | | | Merge branch 'PHP-5.6' | Tjerk Meesters | 2014-03-07 | 2 | -0/+49 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.5' into PHP-5.6 | Tjerk Meesters | 2014-03-07 | 2 | -0/+49 |
| |\ \ | | |/ | |||||
| | * | Add fread(length) method | datibbaw | 2014-03-07 | 2 | -0/+49 |
* | | | Merge branch 'PHP-5.6' | Nikita Popov | 2014-03-06 | 6 | -1/+675 |
|\ \ \ | |/ / | |||||
| * | | Fix #66698: Add fnv1a32 and fnv1a64 hash options | Michael M Slusarz | 2014-03-06 | 6 | -1/+675 |
* | | | Merge branch 'PHP-5.6' | Nikita Popov | 2014-03-06 | 4 | -7/+10 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.5' into PHP-5.6 | Nikita Popov | 2014-03-06 | 4 | -7/+10 |
| |\ \ | | |/ | |||||
| | * | Merge branch 'PHP-5.4' into PHP-5.5 | Nikita Popov | 2014-03-06 | 4 | -7/+10 |
| | |\ | |||||
| | | * | Fix HTML entity table generation | Dmitry Panin | 2014-03-06 | 4 | -7/+10 |
* | | | | Merge branch 'PHP-5.6' | Nikita Popov | 2014-03-06 | 1 | -0/+25 |
|\ \ \ \ | |/ / / | |||||
| * | | | Add test for bug #62102 / RFC 2144 | Andrey Andreev | 2014-03-06 | 1 | -0/+25 |
* | | | | Merge branch 'PHP-5.6' | Remi Collet | 2014-03-06 | 1 | -0/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'PHP-5.5' into PHP-5.6 | Remi Collet | 2014-03-06 | 1 | -0/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch 'PHP-5.4' into PHP-5.5 | Remi Collet | 2014-03-06 | 1 | -0/+1 |
| | |\ \ | | | |/ | |||||
| | | * | Set default Digest Message to use SHA1 instead of MD5 in openssl tests | Remi Collet | 2014-03-06 | 1 | -0/+1 |
* | | | | Merge branch 'PHP-5.6' | Daniel Lowrey | 2014-03-05 | 22 | -1176/+1647 |
|\ \ \ \ | |/ / / | |||||
| * | | | Add encrypted server SNI support | Daniel Lowrey | 2014-03-05 | 6 | -0/+516 |
| * | | | Raise timeout to 2s, reworded ssl timeout warning | datibbaw | 2014-03-05 | 8 | -12/+12 |
| * | | | Refactor + reorganize openssl files | Daniel Lowrey | 2014-03-05 | 10 | -1163/+1120 |
| * | | | Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 | Andrey Hristov | 2014-03-05 | 33 | -498/+643 |
| |\ \ \ | |||||
* | \ \ \ | Merge branch 'master' of git.php.net:php-src | Andrey Hristov | 2014-03-05 | 33 | -498/+643 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'PHP-5.6' | Nikita Popov | 2014-03-05 | 33 | -498/+643 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Use zpp for accepting encryption mode string | Nikita Popov | 2014-03-05 | 3 | -50/+38 |
| | * | | | | Remove a number of macros that are no longer used | Nikita Popov | 2014-03-05 | 1 | -42/+0 |
| | * | | | | Provide expected IV length in IV error messages | Nikita Popov | 2014-03-05 | 12 | -94/+108 |
| | * | | | | Call mcrypt_module_close on error | Nikita Popov | 2014-03-05 | 1 | -0/+4 |
| | * | | | | Print supported key sizes in error message | Nikita Popov | 2014-03-05 | 15 | -134/+186 |
| | * | | | | Clean up do_crypt code | Nikita Popov | 2014-03-05 | 1 | -61/+57 |
| | * | | | | Abort on invalid key size | Nikita Popov | 2014-03-05 | 31 | -194/+322 |
| | * | | | | Abort on missing IV if the enc_mode requires it | Nikita Popov | 2014-03-05 | 4 | -11/+14 |
| | * | | | | Abort on invalid IV size | Nikita Popov | 2014-03-05 | 9 | -76/+78 |
* | | | | | | Merge branch 'PHP-5.6' | Andrey Hristov | 2014-03-05 | 11 | -387/+676 |
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | | |||||
| * | | | | Refactor the result set data structures. Move more to the buffered and unbuff... | Andrey Hristov | 2014-03-05 | 11 | -387/+676 |
| |/ / / | |||||
* | | | | Merge branch 'PHP-5.6' | Remi Collet | 2014-03-05 | 2 | -9/+16 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'PHP-5.5' into PHP-5.6 | Remi Collet | 2014-03-05 | 2 | -9/+16 |
| |\ \ \ | | |/ / | |||||
| | * | | Fixed Bug #66815 imagecrop(): insufficient fix for NULL defer CVE-2013-7327 | Remi Collet | 2014-03-05 | 2 | -9/+16 |
* | | | | Merge branch 'PHP-5.6' | Remi Collet | 2014-03-04 | 1 | -2/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | fix merge | Remi Collet | 2014-03-04 | 1 | -2/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch 'PHP-5.4' into PHP-5.5 | Remi Collet | 2014-03-04 | 1 | -16/+18 |
| | |\ \ | | | |/ | |||||
| | | * | Fixed Bug #66820 out-of-bounds memory access in fileinfo | Remi Collet | 2014-03-04 | 1 | -16/+18 |
* | | | | Merge branch 'PHP-5.6' | Remi Collet | 2014-03-04 | 1 | -2/+10 |
|\ \ \ \ | |/ / / | |||||
| * | | | fix merge | Remi Collet | 2014-03-04 | 1 | -2/+10 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch 'PHP-5.4' into PHP-5.5 | Remi Collet | 2014-03-04 | 1 | -4/+12 |
| | |\ \ | | | |/ | |||||
| | | * | Improves fix for memory leak, keep in sync with upstream. | Remi Collet | 2014-03-04 | 1 | -4/+12 |
* | | | | Merge branch 'PHP-5.6' | Tjerk Meesters | 2014-03-03 | 2 | -8/+86 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'PHP-5.5' into PHP-5.6 | Tjerk Meesters | 2014-03-03 | 2 | -8/+86 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch 'PHP-5.4' into PHP-5.5 | Tjerk Meesters | 2014-03-03 | 2 | -8/+86 |
| | |\ \ | | | |/ |