]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Tue, 24 Oct 2017 11:44:03 +0000 (13:44 +0200)
committerAnatol Belski <ab@php.net>
Tue, 24 Oct 2017 11:44:03 +0000 (13:44 +0200)
commit4d31ee90430ad06a242a77cd18026b9da7c0d1a7
treedec1f7e0b1fbf14dd4e8a997d2c5de22f892403c
parent1758525df95065dea434113a820c5bdacb193f8e
parent5efbcd1882abaf6ef64cc5ee5266040353ba25b2
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #75055 Out-Of-Bounds Read in timelib_meridian()
  Apply upstream patch for CVE-2016-1283
ext/date/lib/parse_date.c
ext/date/lib/parse_date.re
ext/date/tests/bug53437_var3.phpt