From: Xinchen Hui <laruence@gmail.com>
Date: Mon, 15 Feb 2016 02:29:28 +0000 (+0800)
Subject: Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6
X-Git-Tag: php-7.0.4RC1~20^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5e152f54ae2d431d983476edd822eb522f39743f;p=php

Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6

* 'PHP-5.6' of git.php.net:/php-src:
  update NEWS
  Fixed bug #71559 Built-in HTTP server, we can downlaod file in web by bug
  Check length of string before comparing to :memory:
  Fix bounds check in strip_tags()
  Fix test description
  FIx bug #71569
---

5e152f54ae2d431d983476edd822eb522f39743f