]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorRemi Collet <remi@php.net>
Tue, 21 May 2013 16:09:02 +0000 (18:09 +0200)
committerRemi Collet <remi@php.net>
Tue, 21 May 2013 16:09:02 +0000 (18:09 +0200)
commit4840ff0f05876ee614d17804d2340f2233eb4111
tree4a777967561c23b6ea01d54591df38ecc632e733
parent378a5f9bfe03ca7251af5dd6cd9c3be1a6524b34
parent646ebc2cb9148404ffbccf14413b794f3a1e0688
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Integer overflow in SndToJewish leads to php hang AT least in (inputDay is long, metonicCycle is int):    metonicCycle = (inputDay + 310) / 6940;
ext/calendar/jewish.c