Xinchen Hui 04a52443e7 Merge branch 'PHP-5.5' into PHP-5.6 ...

Conflicts:
	main/php_version.h

2013-12-27 14:06:35 +08:00

..

libgd

Merge branch 'PHP-5.5'

2013-09-09 11:56:58 +02:00

tests

Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop())

2013-12-27 14:04:59 +08:00

config.m4

Merge branch 'PHP-5.4' into PHP-5.5

2013-12-07 19:41:23 -08:00

config.w32

fixe preprocessor definition

2013-05-15 14:24:21 +02:00

CREDITS

…

gd_compat.c

gd: fix previous (bad include)

2013-05-06 10:07:06 +02:00

gd_compat.h

Revert removal of overflow2 use in gd.c

2013-05-06 10:00:45 +02:00

gd_ctx.c

Required GD >= 2.1.0 or GD bundled, this allows us to remove most of the #ifdef

2013-05-04 16:50:06 +02:00

gd.c

Merge branch 'PHP-5.5' into PHP-5.6

2013-12-27 14:06:35 +08:00

gd.dsp

revert change #298288: Remove old dsp/dsw/makefile files

2010-04-28 14:41:51 +00:00

gdcache.c

Required GD >= 2.1.0 or GD bundled, this allows us to remove most of the #ifdef

2013-05-04 16:50:06 +02:00

gdcache.h

…

php_gd.h

Merge branch 'PHP-5.4' into PHP-5.5

2013-10-20 01:16:10 -02:00