From: Xinchen Hui <laruence@gmail.com>
Date: Tue, 26 Jan 2016 07:57:49 +0000 (+0800)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.2.0alpha1~620^2~72
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c58ad955a9b48729268142c360c06387c2ea28d8;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed bug #71443 (Segfault using built-in webserver with intl using symfony)
  Fix memory leak with not freeing OpenSSL errors
  check for NULL and avoid crashes
  Update libmagic.patch for PHP-5.6
  Fixed bug #7143	(finfo throws notice for specific python file)
---

c58ad955a9b48729268142c360c06387c2ea28d8