]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.1' into PHP-7.2
authorAnatol Belski <ab@php.net>
Fri, 27 Oct 2017 12:18:27 +0000 (14:18 +0200)
committerAnatol Belski <ab@php.net>
Fri, 27 Oct 2017 12:18:27 +0000 (14:18 +0200)
commit40f76c9f0c52658a65479fa01456376c870ed5c9
tree530826bee07c5c0c9e4a52acbca0bd3d4d0f4935
parentf577a03c045e02b80ee0c3ed340bb186500a7342
parent211dacd7b5c945580e763f7322be85b8be7d92ec
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Apply upstream patch for CVE-2017-14107
  Backport and apply upstream patch for CVE-2017-14107