diff options
| author | Julien Pauli <jpauli@php.net> | 2015-07-08 16:41:46 +0200 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2015-07-08 16:41:46 +0200 |
| commit | 0f8ea7cc44669c4f9041af68c488a429dcfd844e (patch) | |
| tree | 6c772df7f74d20d19fb4800d0bd838212562fa6a /ext/sqlite3/php_sqlite3_structs.h | |
| parent | 5254ddb3550235542ab9352795e20c8bb63c46f9 (diff) | |
| parent | b4b082e63ecab2a81e565fb07aafaaaf67b77f66 (diff) | |
| download | php-git-0f8ea7cc44669c4f9041af68c488a429dcfd844e.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.5.27
* 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
add missing second argument for ucfirst to the proto
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
fix unknown size of void error
5.5.28 now - Security Only
Move strlen() check to php_mail_detect_multiple_crlf()
Fixed Bug #69874 : Can't set empty additional_headers for mail()
Conflicts:
configure.in
main/php_version.h
Diffstat (limited to 'ext/sqlite3/php_sqlite3_structs.h')
0 files changed, 0 insertions, 0 deletions