From: Stanislav Malyshev <stas@php.net>
Date: Tue, 2 Feb 2016 03:16:34 +0000 (-0800)
Subject: Merge branch 'PHP-5.6.18' into PHP-5.6
X-Git-Tag: php-7.0.4RC1~20^2~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=41be90d95b24c511c87dcffcaec461f4f9f3b3c3;p=php

Merge branch 'PHP-5.6.18' into PHP-5.6

* PHP-5.6.18:
  fix tests
  fix NEWS
  Update NEWS
  update NEWS
  Fixed bug #71488: Stack overflow when decompressing tar archives
  update NEWS
  add missing headers for SIZE_MAX
  backport the escapeshell* functions hardening branch
  add tests
  Fix bug #71459 - Integer overflow in iptcembed()
  prepare 5.6.18RC1
  Fixed bug #71323 - Output of stream_get_meta_data can be falsified by its input
  Fix bug #71391: NULL Pointer Dereference in phar_tar_setupmetadata()
  Fixed bug #71331 - Uninitialized pointer in phar_make_dirstream()
  Fix bug #71335: Type Confusion in WDDX Packet Deserialization
  Fix bug #71354 - remove UMR when size is 0

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

41be90d95b24c511c87dcffcaec461f4f9f3b3c3