]> granicus.if.org Git - php/commit
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)
commit6f8585fc7de0e26f9c447269fb26f5a112f15d67
tree25114b6ddcc094b70a432de137080bec1840c272
parent3fb566f47531a232544cb5d1361f15f26e0ca02c
parenteaf4e77190d402ea014207e9a7d5da1a4f3727ba
Merge branch 'PHP-7.0.4' into PHP-7.0

* 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