Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'PHP-7.0' into PHP-7.1 | Christoph M. Becker | 2016-08-17 | 21 | -1/+69 |
|\ | |||||
| * | Merge branch 'PHP-5.6' into PHP-7.0 | Christoph M. Becker | 2016-08-17 | 21 | -1/+69 |
| |\ | |||||
| | * | Skip tests that are supposed to fail due to bugs in old external libgd | Christoph M. Becker | 2016-08-17 | 21 | -1/+69 |
* | | | Make this test also a little more resilient | Christoph M. Becker | 2016-08-17 | 1 | -2/+2 |
* | | | Merge branch 'PHP-7.0' into PHP-7.1 | Christoph M. Becker | 2016-08-17 | 30 | -60/+60 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.6' into PHP-7.0 | Christoph M. Becker | 2016-08-17 | 30 | -60/+60 |
| |\ \ | | |/ | |||||
| | * | Make tests a little more resilient | Christoph M. Becker | 2016-08-17 | 30 | -60/+60 |
| | * | fix tests | Stanislav Malyshev | 2016-08-16 | 2 | -3/+3 |
| | * | Fix bug #72730 - imagegammacorrect allows arbitrary write access | Stanislav Malyshev | 2016-08-16 | 2 | -0/+20 |
| | * | Fix bug#72697 - select_colors write out-of-bounds | Stanislav Malyshev | 2016-08-16 | 2 | -8/+25 |
| | * | fix ts build | Anatol Belski | 2016-08-03 | 1 | -1/+1 |
* | | | Merge branch 'PHP-7.0' into PHP-7.1 | Xinchen Hui | 2016-08-17 | 5 | -6/+43 |
|\ \ \ | |/ / | |||||
| * | | fix tests | Anatol Belski | 2016-08-16 | 2 | -3/+3 |
| * | | Fix bug#72697 - select_colors write out-of-bounds | Anatol Belski | 2016-08-16 | 2 | -3/+20 |
| * | | Fix bug #72730 - imagegammacorrect allows arbitrary write access | Stanislav Malyshev | 2016-08-16 | 2 | -0/+20 |
* | | | Merge branch 'PHP-7.0' into PHP-7.1 | Christoph M. Becker | 2016-08-02 | 2 | -1/+26 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.6' into PHP-7.0 | Christoph M. Becker | 2016-08-02 | 2 | -1/+26 |
| |\ \ | | |/ | |||||
| | * | Fix #72709: imagesetstyle() causes OOB read for empty $styles | Christoph M. Becker | 2016-08-02 | 2 | -1/+26 |
* | | | Merge branch 'PHP-7.0' into PHP-7.1 | Christoph M. Becker | 2016-07-25 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.6' into PHP-7.0 | Christoph M. Becker | 2016-07-25 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | Fix broken test case | Christoph M. Becker | 2016-07-25 | 1 | -1/+1 |
* | | | Merge branch 'PHP-7.0' into PHP-7.1 | Christoph M. Becker | 2016-07-25 | 1 | -10/+12 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.6' into PHP-7.0 | Christoph M. Becker | 2016-07-25 | 1 | -10/+12 |
| |\ \ | | |/ | |||||
| | * | Fix broken test case | Christoph M. Becker | 2016-07-25 | 1 | -11/+13 |
* | | | Merge branch 'PHP-7.0' into PHP-7.1 | Christoph M. Becker | 2016-07-23 | 1 | -28/+8 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.6' into PHP-7.0 | Christoph M. Becker | 2016-07-23 | 1 | -28/+8 |
| |\ \ | | |/ | |||||
| | * | Fix #68712: suspicious if-else statements | Christoph M. Becker | 2016-07-23 | 1 | -28/+8 |
* | | | Merge branch 'PHP-7.0' into PHP-7.1 | Christoph M. Becker | 2016-07-23 | 1 | -4/+4 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.6' into PHP-7.0 | Christoph M. Becker | 2016-07-23 | 1 | -4/+4 |
| |\ \ | | |/ | |||||
| | * | Fix copy&paste errors in gd_interpolation.c | Christoph M. Becker | 2016-07-23 | 1 | -4/+4 |
* | | | Merge branch 'PHP-7.0' into PHP-7.1 | Christoph M. Becker | 2016-07-23 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.6' into PHP-7.0 | Christoph M. Becker | 2016-07-23 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | Fix #66555: Always false condition in ext/gd/libgd/gdkanji.c | Christoph M. Becker | 2016-07-23 | 1 | -1/+1 |
* | | | Add test case for imagecopyresampled() with alpha | Christoph M. Becker | 2016-07-20 | 1 | -0/+70 |
* | | | Merge branch 'PHP-7.0' | Stanislav Malyshev | 2016-07-19 | 1 | -2/+47 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.6' into PHP-7.0 | Stanislav Malyshev | 2016-07-19 | 1 | -2/+47 |
| |\ \ | | |/ | |||||
| | * | Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 | Pierre Joye | 2016-07-20 | 3 | -16/+50 |
| | |\ | |||||
| | * | | #72482, revert for 5.6 for now | Pierre Joye | 2016-07-20 | 1 | -2/+47 |
* | | | | Merge branch 'PHP-7.0' | Christoph M. Becker | 2016-07-19 | 3 | -16/+50 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'PHP-5.6' into PHP-7.0 | Christoph M. Becker | 2016-07-19 | 3 | -16/+50 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Fix #43828: broken transparency of imagearc for truecolor in blendingmode | Christoph M. Becker | 2016-07-19 | 3 | -16/+50 |
| | |/ | |||||
* | | | Merge branch 'PHP-7.0' | Pierre Joye | 2016-07-19 | 3 | -49/+5 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.6' into PHP-7.0 | Pierre Joye | 2016-07-19 | 1 | -47/+2 |
| |\ \ | | |/ | |||||
| | * | #72482, Ilegal write/read access caused by gdImageAALine overflow | Pierre Joye | 2016-07-19 | 1 | -47/+2 |
| * | | merge conflict | Pierre Joye | 2016-07-19 | 1 | -2/+2 |
| |\ \ | | |/ | |||||
| | * | fix #72494, improve input color check and prevent issues when old gd are used... | Pierre Joye | 2016-07-19 | 1 | -1/+1 |
| * | | Merge branch 'PHP-5.6' into PHP-7.0 | Pierre Joye | 2016-07-19 | 1 | -0/+1 |
| |\ \ | | |/ | |||||
| | * | improve fix #72558, free contribRow as well | Pierre Joye | 2016-07-19 | 1 | -0/+1 |
| * | | Merge branch 'PHP-5.6' into PHP-7.0 | Pierre Joye | 2016-07-19 | 1 | -3/+4 |
| |\ \ | | |/ | |||||
* | | | Merge branch 'PHP-7.0' | Stanislav Malyshev | 2016-07-19 | 1 | -3/+4 |
|\ \ \ |