From: Stanislav Malyshev <stas@php.net>
Date: Tue, 7 Jul 2015 17:19:20 +0000 (-0700)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: php-7.0.0beta1~12^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a5e7075d79bbee954e909a7afd9eb27256e42af6;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  Better fix for bug #69958
  update news
  Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
  Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
  Fix bug #69958 - Segfault in Phar::convertToData on invalid file
  Better fix for bug #69958
  Better fix for bug #69958
  update news
  Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
  Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
  Fix bug #69958 - Segfault in Phar::convertToData on invalid file

Conflicts:
	ext/mysqlnd/mysqlnd.c
	ext/phar/phar_object.c
---

a5e7075d79bbee954e909a7afd9eb27256e42af6