From: Xinchen Hui <laruence@gmail.com>
Date: Mon, 16 May 2016 03:25:16 +0000 (+0800)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~126
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5656292a18711ce97c21aa2a261cdae8627db532;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  Revert the ABI break commit
  Revert "fix #72143 (preg_replace uses int instead of size_t on zend_string_allocs)"
---

5656292a18711ce97c21aa2a261cdae8627db532