From: Anatol Belski <ab@php.net>
Date: Tue, 24 Oct 2017 11:45:16 +0000 (+0200)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.0RC5~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e97b10f1a00dc5783e870a26f353dbad8a4d3a86;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed bug #75055 Out-Of-Bounds Read in timelib_meridian()
  Apply upstream patch for CVE-2016-1283
---

e97b10f1a00dc5783e870a26f353dbad8a4d3a86
diff --cc ext/date/lib/parse_date.c
index bb6cf5f6e2,36bcdcc28a..77599057f9
--- a/ext/date/lib/parse_date.c
+++ b/ext/date/lib/parse_date.c
@@@ -1,4 -1,4 +1,4 @@@
- /* Generated by re2c 0.15.3 on Mon Sep  4 22:44:17 2017 */
 -/* Generated by re2c 0.15.3 on Tue Oct 24 13:42:24 2017 */
++/* Generated by re2c 0.15.3 on Tue Oct 24 13:44:48 2017 */
  #line 1 "ext/date/lib/parse_date.re"
  /*
   * The MIT License (MIT)