]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.3' into PHP-7.4
authorStanislav Malyshev <stas@php.net>
Sun, 25 Aug 2019 06:17:12 +0000 (23:17 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 25 Aug 2019 06:17:12 +0000 (23:17 -0700)
* PHP-7.3:
  Fix CVE-2019-13224: don't allow different encodings for onig_new_deluxe()
  set version for release


Trivial merge