From: Stanislav Malyshev <stas@php.net>
Date: Wed, 2 Mar 2016 06:22:47 +0000 (-0800)
Subject: Merge branch 'PHP-7.0.4' into PHP-7.0
X-Git-Tag: php-7.0.5RC1~37
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6f8585fc7de0e26f9c447269fb26f5a112f15d67;p=php

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
---

6f8585fc7de0e26f9c447269fb26f5a112f15d67