From: Anatol Belski <ab@php.net>
Date: Thu, 5 Nov 2015 18:51:18 +0000 (+0100)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~865
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e240df14203ee311114d914d2f92269e27e83177;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  add test for bug #70861
  Fix setting of empty string resource.
  fix possible NULL deref in image functions
---

e240df14203ee311114d914d2f92269e27e83177