From: Stanislav Malyshev <stas@php.net>
Date: Sun, 25 Aug 2019 06:17:12 +0000 (-0700)
Subject: Merge branch 'PHP-7.3' into PHP-7.4
X-Git-Tag: php-7.4.0RC1~50
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=377f30acb20d76e0a5f71663651addd5a2805657;p=php

Merge branch 'PHP-7.3' into PHP-7.4

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

377f30acb20d76e0a5f71663651addd5a2805657