summaryrefslogtreecommitdiff
path: root/ext
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-5.6'Tjerk Meesters2014-03-072-1/+7
|\
| * Merge branch 'PHP-5.5' into PHP-5.6Tjerk Meesters2014-03-072-1/+7
| |\
| | * Fixed null terminationTjerk Meesters2014-03-072-1/+7
* | | Merge branch 'PHP-5.6'Tjerk Meesters2014-03-072-0/+49
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.5' into PHP-5.6Tjerk Meesters2014-03-072-0/+49
| |\ \ | | |/
| | * Add fread(length) methoddatibbaw2014-03-072-0/+49
* | | Merge branch 'PHP-5.6'Nikita Popov2014-03-066-1/+675
|\ \ \ | |/ /
| * | Fix #66698: Add fnv1a32 and fnv1a64 hash optionsMichael M Slusarz2014-03-066-1/+675
* | | Merge branch 'PHP-5.6'Nikita Popov2014-03-064-7/+10
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.5' into PHP-5.6Nikita Popov2014-03-064-7/+10
| |\ \ | | |/
| | * Merge branch 'PHP-5.4' into PHP-5.5Nikita Popov2014-03-064-7/+10
| | |\
| | | * Fix HTML entity table generationDmitry Panin2014-03-064-7/+10
* | | | Merge branch 'PHP-5.6'Nikita Popov2014-03-061-0/+25
|\ \ \ \ | |/ / /
| * | | Add test for bug #62102 / RFC 2144Andrey Andreev2014-03-061-0/+25
* | | | Merge branch 'PHP-5.6'Remi Collet2014-03-061-0/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-03-061-0/+1
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2014-03-061-0/+1
| | |\ \ | | | |/
| | | * Set default Digest Message to use SHA1 instead of MD5 in openssl testsRemi Collet2014-03-061-0/+1
* | | | Merge branch 'PHP-5.6'Daniel Lowrey2014-03-0522-1176/+1647
|\ \ \ \ | |/ / /
| * | | Add encrypted server SNI supportDaniel Lowrey2014-03-056-0/+516
| * | | Raise timeout to 2s, reworded ssl timeout warningdatibbaw2014-03-058-12/+12
| * | | Refactor + reorganize openssl filesDaniel Lowrey2014-03-0510-1163/+1120
| * | | Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6Andrey Hristov2014-03-0533-498/+643
| |\ \ \
* | \ \ \ Merge branch 'master' of git.php.net:php-srcAndrey Hristov2014-03-0533-498/+643
|\ \ \ \ \
| * \ \ \ \ Merge branch 'PHP-5.6'Nikita Popov2014-03-0533-498/+643
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Use zpp for accepting encryption mode stringNikita Popov2014-03-053-50/+38
| | * | | | Remove a number of macros that are no longer usedNikita Popov2014-03-051-42/+0
| | * | | | Provide expected IV length in IV error messagesNikita Popov2014-03-0512-94/+108
| | * | | | Call mcrypt_module_close on errorNikita Popov2014-03-051-0/+4
| | * | | | Print supported key sizes in error messageNikita Popov2014-03-0515-134/+186
| | * | | | Clean up do_crypt codeNikita Popov2014-03-051-61/+57
| | * | | | Abort on invalid key sizeNikita Popov2014-03-0531-194/+322
| | * | | | Abort on missing IV if the enc_mode requires itNikita Popov2014-03-054-11/+14
| | * | | | Abort on invalid IV sizeNikita Popov2014-03-059-76/+78
* | | | | | Merge branch 'PHP-5.6'Andrey Hristov2014-03-0511-387/+676
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | Refactor the result set data structures. Move more to the buffered and unbuff...Andrey Hristov2014-03-0511-387/+676
| |/ / /
* | | | Merge branch 'PHP-5.6'Remi Collet2014-03-052-9/+16
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-03-052-9/+16
| |\ \ \ | | |/ /
| | * | Fixed Bug #66815 imagecrop(): insufficient fix for NULL defer CVE-2013-7327Remi Collet2014-03-052-9/+16
* | | | Merge branch 'PHP-5.6'Remi Collet2014-03-041-2/+2
|\ \ \ \ | |/ / /
| * | | fix mergeRemi Collet2014-03-041-2/+2
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2014-03-041-16/+18
| | |\ \ | | | |/
| | | * Fixed Bug #66820 out-of-bounds memory access in fileinfoRemi Collet2014-03-041-16/+18
* | | | Merge branch 'PHP-5.6'Remi Collet2014-03-041-2/+10
|\ \ \ \ | |/ / /
| * | | fix mergeRemi Collet2014-03-041-2/+10
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2014-03-041-4/+12
| | |\ \ | | | |/
| | | * Improves fix for memory leak, keep in sync with upstream.Remi Collet2014-03-041-4/+12
* | | | Merge branch 'PHP-5.6'Tjerk Meesters2014-03-032-8/+86
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.5' into PHP-5.6Tjerk Meesters2014-03-032-8/+86
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.4' into PHP-5.5Tjerk Meesters2014-03-032-8/+86
| | |\ \ | | | |/