]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 35f6f9b aa10fc6)
Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6
authorXinchen Hui <laruence@gmail.com>
Mon, 15 Feb 2016 02:29:28 +0000 (10:29 +0800)
committerXinchen Hui <laruence@gmail.com>
Mon, 15 Feb 2016 02:29:28 +0000 (10:29 +0800)
* '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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.