From: Stanislav Malyshev <stas@php.net>
Date: Wed, 27 Apr 2016 06:48:41 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-7.0.7RC1~69^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e315a162da99f59e82a5272714a6f3d4d724b037;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix memory leak
  Fix bug #72099: xml_parse_into_struct segmentation fault
  5.5.36 now
  Fix bug #72094 - Out of bounds heap read access in exif header processing
  Fix bug #72093: bcpowmod accepts negative scale and corrupts _one_ definition
  Fix bug #72061 - Out-of-bounds reads in zif_grapheme_stripos with negative offset
  Fix for bug #71912 (libgd: signedness vulnerability)
  Typo in NEWS

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

e315a162da99f59e82a5272714a6f3d4d724b037