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

Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed bug #72218 (If host name cannot be resolved then PHP 7 crashes)
  fix #72143 (preg_replace uses int instead of size_t on zend_string_allocs)
  fix #72206 (xml_parser_create/xml_parser_free leaks mem)
  improve 7132fe19c29c512d00a3afe101212ba15fa1f99e
  fix 1bb8a7b0b895af4a9e6b24101fe8fab5af64f86c
  fix #72180 (Env variables incorrectly pretty printed in config.nice, phpinfo)

Conflicts:
	acinclude.m4
---

3994a70b910841492b03da165c691f36b82b2f72