]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9d8a003 af5cc61)
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Mon, 12 May 2014 01:55:02 +0000 (18:55 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 12 May 2014 01:56:32 +0000 (18:56 -0700)
commitf2fdeba19d37080ddc27198a0879bb0254684c5b
tree349e3a622724d594aab12effb4a0376ff026c6b9tree | snapshot
parent9d8a00337dc92273e1006cfc72e21dcc4217fa9bcommit | diff
parentaf5cc61cf374f3700872c989cfdf8e197248c57ccommit | diff
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix bug #67248 (imageaffinematrixget missing check of parameters)
  Fix bug #67247 spl_fixedarray_resize integer overflow
  fix news
  add tests stuff to README
  Updated NEWS
  Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245) Linux apparently does not like memcpy in overlapping regions...
NEWS diff1 | diff2 | blob | history
ext/gd/gd.c diff1 | diff2 | blob | history
ext/spl/spl_fixedarray.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.