]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 335d89e 5a70390)
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Tue, 19 Aug 2014 08:34:09 +0000 (01:34 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 19 Aug 2014 08:34:09 +0000 (01:34 -0700)
* PHP-5.4:
  5.4.32
  fix potentially missing NUL termination
  Fix bug #67730 - Null byte injection possible with imagexxx functions
  Fixed bug #67717 - segfault in dns_get_record
  Fix bug #67716 - Segfault in cdf.c
  5.4.32 RC1

1  2 
ext/gd/gd_ctx.c patch | diff1 | diff2 | blob | history
main/network.c patch | diff1 | diff2 | blob | history

diff --cc ext/gd/gd_ctx.c
Simple merge
diff --cc main/network.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.