]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 54840f9 55b8800)
Merge branch 'PHP-5.6' into PHP-7.0
authorRemi Collet <remi@php.net>
Wed, 5 Jul 2017 08:02:21 +0000 (10:02 +0200)
committerRemi Collet <remi@php.net>
Wed, 5 Jul 2017 08:02:21 +0000 (10:02 +0200)
commit8b1559b9f417bdc6099704c29a6e1cd9ece3355b
tree6c489c2196b2adde2d7414ae650cd55775977d1etree | snapshot
parent54840f9c8f9edb4c243f7f2d7ffbb61759ef9507commit | diff
parent55b880070c55cde810f6fb89cda5c8b405cc95cacommit | diff
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  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
Unnamed repository; edit this file 'description' to name the repository.