Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2015-01-04 | 1 | -2/+2 |
|\ | |||||
| * | fix memory leak | Stanislav Malyshev | 2015-01-04 | 1 | -2/+2 |
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2015-01-04 | 12 | -1/+79 |
|\ \ | |/ | |||||
| * | Merge branch 'pull-request/742' into PHP-5.5 | Stanislav Malyshev | 2015-01-04 | 4 | -0/+65 |
| |\ | |||||
| * | | fix GD tests with no GD loaded | Stanislav Malyshev | 2015-01-04 | 8 | -1/+14 |
* | | | Fix bug #68656 Report gd library version | Remi Collet | 2014-12-26 | 2 | -0/+8 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Remi Collet | 2014-12-17 | 1 | -6/+6 |
|\ \ \ | |/ / | |||||
| * | | Better fix for #68601 for perf | Remi Collet | 2014-12-17 | 1 | -6/+6 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Remi Collet | 2014-12-13 | 1 | -2/+9 |
|\ \ \ | |/ / | |||||
| * | | Fix bug #68601 buffer read overflow in gd_gif_in.c | Remi Collet | 2014-12-13 | 1 | -2/+9 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2014-11-24 | 3 | -0/+57 |
|\ \ \ | |/ / | |||||
| * | | move tests into proper place | Stanislav Malyshev | 2014-11-24 | 3 | -0/+57 |
* | | | typo fixes - https://github.com/vlajos/misspell_fixer | Veres Lajos | 2014-11-23 | 5 | -6/+6 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Ferenc Kovacs | 2014-10-15 | 1 | -2/+14 |
|\ \ \ | |/ / | |||||
| * | | Fixed Bug #65171 imagescale() fails | Remi Collet | 2014-10-15 | 1 | -2/+14 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Matteo Beccati | 2014-09-16 | 2 | -30/+4 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Matteo Beccati | 2014-09-16 | 2 | -30/+4 |
| |\ \ | |||||
| | * | | Fixed freetype test on multiple environments | Matteo Beccati | 2014-09-16 | 2 | -30/+4 |
* | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Matteo Beccati | 2014-09-03 | 2 | -2/+28 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'PHP-5.4' into PHP-5.5 | Matteo Beccati | 2014-09-03 | 2 | -2/+28 |
| |\ \ \ | | |/ / | |||||
| | * | | Fixed test with freetype >= 2.4.12 | Matteo Beccati | 2014-09-03 | 2 | -2/+28 |
* | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Lior Kaplan | 2014-08-25 | 7 | -0/+252 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'PHP-5.4' into PHP-5.5 | Lior Kaplan | 2014-08-25 | 7 | -0/+252 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk> | Lior Kaplan | 2014-08-25 | 7 | -0/+252 |
* | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Sara Golemon | 2014-08-19 | 1 | -2/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'PHP-5.4' into PHP-5.5 | Sara Golemon | 2014-08-19 | 1 | -2/+4 |
| |\ \ \ | | |/ / | |||||
| | * | | Switch use of strtok() to gd_strtok_r() | Sara Golemon | 2014-08-19 | 1 | -2/+4 |
* | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2014-08-19 | 1 | -0/+5 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-08-19 | 1 | -0/+5 |
| |\ \ \ | | |/ / | |||||
| | * | | Fix bug #67730 - Null byte injection possible with imagexxx functions | Stanislav Malyshev | 2014-08-18 | 1 | -0/+5 |
* | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Andrey Hristov | 2014-08-06 | 1 | -1/+6 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'PHP-5.4' into PHP-5.5 | Andrey Hristov | 2014-08-06 | 1 | -1/+6 |
| |\ \ \ | | |/ / | | | / | | |/ | |/| | |||||
| | * | Fixed Bug #66901 php-gd 'c_color' NULL pointer dereference | Remi Collet | 2014-08-04 | 1 | -1/+6 |
| | * | Bump year | Xinchen Hui | 2014-01-03 | 4 | -4/+4 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2014-05-11 | 2 | -2/+33 |
|\ \ \ | |/ / | |||||
| * | | Fix bug #67248 (imageaffinematrixget missing check of parameters) | Stanislav Malyshev | 2014-05-11 | 2 | -2/+33 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2014-03-12 | 1 | -0/+4 |
|\ \ \ | |/ / | |||||
| * | | made libgd recognize the 9 version series | Anatol Belski | 2014-03-12 | 1 | -0/+4 |
* | | | fix include search | Anatol Belski | 2014-03-12 | 1 | -0/+1 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Remi Collet | 2014-03-12 | 1 | -6/+6 |
|\ \ \ | |/ / | |||||
| * | | Fix bug #66887 imagescale - poor quality of scaled image | Remi Collet | 2014-03-12 | 1 | -6/+6 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Remi Collet | 2014-03-12 | 2 | -28/+5 |
|\ \ \ | |/ / | |||||
| * | | Fixed Bug #66893i imagescale ignore method argument | Remi Collet | 2014-03-12 | 2 | -28/+5 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Remi Collet | 2014-03-12 | 1 | -3/+7 |
|\ \ \ | |/ / | |||||
| * | | Fixed Bug #66890 imagescale segfault | Remi Collet | 2014-03-12 | 1 | -3/+7 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Pierre Joye | 2014-03-09 | 1 | -0/+1 |
|\ \ \ | |/ / | |||||
| * | | - fix #66869, Invalid 2nd argument crashes imageaffinematrixget | Pierre Joye | 2014-03-09 | 1 | -0/+1 |
* | | | 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.5' into PHP-5.6 | Xinchen Hui | 2014-02-20 | 1 | -1/+1 |
|\ \ \ | |/ / |