From: Remi Collet <remi@php.net>
Date: Wed, 5 Jul 2017 08:02:42 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.8RC1~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1e3b960ab5c1ec9fd53177f539d2908a4439d2d2;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  NEWS for oniguruma
  Patch from the upstream git https://github.com/kkos/oniguruma/issues/60 (CVE-2017-9228)
  Patch from the upstream git https://github.com/kkos/oniguruma/issues/59 (CVE-2017-9229) b690371bbf97794b4a1d3f295d4fb9a8b05d402d Modified for onig 5.9.6
  Patch from the upstream git https://github.com/kkos/oniguruma/issues/58 (CVE-2017-9227)
  Patch from the upstream git https://github.com/kkos/oniguruma/issues/57 (CVE-2017-9224)
  Patch from the upstream git https://github.com/kkos/oniguruma/issues/55 (CVE-2017-9226) b4bf968ad52afe14e60a2dc8a95d3555c543353a Modified for onig 5.9.6 f015fbdd95f76438cd86366467bb2b39870dd7c6 Modified for onig 5.9.6
---

1e3b960ab5c1ec9fd53177f539d2908a4439d2d2