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

Merge branch 'PHP-7.0.4' into PHP-7.0

* PHP-7.0.4: (21 commits)
  update NEWS
  fix test file
  Fix version
  update NEWS
  Update NEWS
  Fix bug #71610: Type Confusion Vulnerability - SOAP / make_http_soap_request()
  Fix bug #71637: Multiple Heap Overflow due to integer overflows
  extend check for add_flag
  Fixed another segfault with file_cache_only now
  set version
  fix nmake clean in phpize mode
  Fixed segfault with file_cache_only
  Fixed possible crash at PCRE on MSHUTDOWN
  Fixed more synchronisation issues during SHM reload
  Set proper type flags (REFCOUNTED and COPYABLE) according to interned or regular string
  sync with improvements in NEWS
  Fixed process synchronisation problem, that may cause crashes after opcache restart
  Fix bug #71498: Out-of-Bound Read in phar_parse_zipfile()
  fix ts buld
  prep for 5.6.19RC1
  ...

Conflicts:
	configure.in
	main/php_version.h
---

22d8e9aced998d9ac385464325ad8663c27ed580