]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.1' into PHP-7.2
authorStanislav Malyshev <stas@php.net>
Sun, 25 Aug 2019 06:15:36 +0000 (23:15 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 25 Aug 2019 06:15:36 +0000 (23:15 -0700)
commit087cb7bab2bc0b9673545b9559db21ea38832ab3
treeb7a9e25f8d8886fb9c8680ced84d8261085450e0
parentff7029b65b43578781abd8c767efa4a90b296351
parent1258303e66d8dede4f02347334b9f6576e98a21b
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
ext/mbstring/oniguruma/src/regext.c