Stanislav Malyshev 4e2fb47092 Merge branch 'PHP-5.4' into PHP-5.5 ...

* PHP-5.4:
  Fix bug #69646	OS command injection vulnerability in escapeshellarg
  Fix #69719 - more checks for nulls in paths
  fix test description
  Fixed Buf #68812 Unchecked return value.

Conflicts:
	ext/dom/document.c
	ext/gd/gd.c

2015-06-09 15:31:27 -07:00

..

libgd

Fixed Bug #69479 GD fails to build with newer libvpx

2015-05-24 09:37:12 +02:00

tests

Merge branch 'PHP-5.4.40' into PHP-5.5.24

2015-04-12 23:49:16 -07:00

config.m4

Merge branch 'PHP-5.4' into PHP-5.5

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

config.w32

backport gd config.w32 to support freetype 2.5

2015-02-12 20:27:48 +01:00

CREDITS

add Marcus, enough work done

2003-06-15 20:16:46 +00:00

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

Bump year

2015-01-15 23:26:03 +08:00

gd.c

Merge branch 'PHP-5.4' into PHP-5.5

2015-06-09 15:31:27 -07: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

Last bit of CS fixes.

2003-12-28 21:08:46 +00:00

php_gd.h

Bump year

2015-01-15 23:26:03 +08:00