]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3fb566f eaf4e77)
Merge branch 'PHP-7.0.4' into PHP-7.0
authorStanislav Malyshev <stas@php.net>
Wed, 2 Mar 2016 06:22:47 +0000 (22:22 -0800)
committerStanislav Malyshev <stas@php.net>
Wed, 2 Mar 2016 06:22:47 +0000 (22:22 -0800)
* PHP-7.0.4:
  Fix bug #71610: Type Confusion Vulnerability - SOAP / make_http_soap_request()
  Fix bug #71637: Multiple Heap Overflow due to integer overflows
  set versions

Conflicts:
configure.in
main/php_version.h


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.