com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/mysqlnd/mysqlnd.c ext/phar/phar.c ext/phar/phar_object.c

From: Date: Tue, 07 Jul 2015 17:12:51 +0000
Subject: com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/mysqlnd/mysqlnd.c ext/phar/phar.c ext/phar/phar_object.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-87819@lists.php.net to get a copy of this message
Commit: 6c884e8e84615488e51f1837656a5a5d0bc2449e Author: Stanislav Malyshev <stas@php.net> Tue, 7 Jul 2015 10:12:51 -0700 Parents: c0142de470b5f57975054a51833273b01f569333 b4b082e63ecab2a81e565fb07aafaaaf67b77f66 Branches: PHP-5.6 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6c884e8e84615488e51f1837656a5a5d0bc2449e Log: Merge branch 'PHP-5.5' into PHP-5.6 * PHP-5.5: 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/phar/phar_object.c Bugs: https://bugs.php.net/69958 https://bugs.php.net/69669 https://bugs.php.net/69923 Changed paths: MM ext/mysqlnd/mysqlnd.c MM ext/phar/phar.c MM ext/phar/phar_object.c Diff:

« previous php.cvs (#87819) next »