]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorAnatol Belski <ab@php.net>
Tue, 24 Oct 2017 11:38:48 +0000 (13:38 +0200)
committerAnatol Belski <ab@php.net>
Tue, 24 Oct 2017 11:38:48 +0000 (13:38 +0200)
commit5efbcd1882abaf6ef64cc5ee5266040353ba25b2
tree5675223f5d16a8aceb7ba6bbcadbb5f85b9deeee
parent9fca58548883925665daa2be544b5d9fd55d2431
parenta7815e63bdab95f7b9b0e32c52c81a4b6ad3a8f6
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  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/tests/bug53437_var3.phpt