From: Stanislav Malyshev <stas@php.net>
Date: Tue, 3 Jan 2017 05:37:06 +0000 (-0800)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.1RC1~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ca72faa2c50b249715597bbee51fcd01718a0494;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix #73832 - leave the table in a safe state if the size is too big.
  Fix bug #73831 - NULL Pointer Dereference while unserialize php object
---

ca72faa2c50b249715597bbee51fcd01718a0494