From: Stanislav Malyshev <stas@php.net>
Date: Sun, 25 Aug 2019 06:15:36 +0000 (-0700)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.4.0RC1~50^2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=087cb7bab2bc0b9673545b9559db21ea38832ab3;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix CVE-2019-13224: don't allow different encodings for onig_new_deluxe()
  set version for release
---

087cb7bab2bc0b9673545b9559db21ea38832ab3