]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8f2e082 0d2f147)
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Tue, 7 Jul 2015 04:52:49 +0000 (21:52 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 7 Jul 2015 04:52:49 +0000 (21:52 -0700)
commit303d97feda15e97f9058e4ab96799ec2dbd3652f
tree8071010fb681343c4f6e8b559dd29064072015bctree | snapshot
parent8f2e08239fc1f8aabc26398393303fa685e810ddcommit | diff
parent0d2f147d80bd02d4d1ccaa0fa530d9d4846b3c75commit | diff
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  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/mysqlnd/mysqlnd.c diff1 | diff2 | blob | history
ext/phar/phar.c diff1 | diff2 | blob | history
ext/phar/phar_object.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.