From: Xinchen Hui <laruence@gmail.com>
Date: Tue, 16 May 2017 11:32:59 +0000 (+0800)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.6RC1~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c667bb94fa7e1ca52bfaea2b372794f96269e03a;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #74600 (crash (SIGSEGV) in _zend_hash_add_or_update_i)
---

c667bb94fa7e1ca52bfaea2b372794f96269e03a