* 'PHP-5.4' of git.php.net:php-src: (62 commits)
Fixed bug #63248 Load multiple magic files on win
Cover have_ssl=NO and have_ssl=DISABLED
- BFN
- Fixed bug #63214 (Large PDO Firebird Queries)
Fix bug #63240 on stream_get_line()
extended the SKIPIF section with ICU 49 (sync with 5.4 branch)
fixed tests for gd having freetype >= 2.4.10
Fixed bug #63258 (seg fault with PDO and dblib using DBSETOPT(H->link, DBQUOTEDIDENT, 1))
Implemented FR #63242 (Default error page in PHP built-in web server uses outdated html/css)
Fix warnings preventing this test from passing
Remove executable permission on inc
Remove executable permission on phpt
Remove executable permission on phpt
Fixed bug #63236 (Executable permission on various source files)
Fixed bug #63235 (buffer overflow in use of SQLGetDiagRec)
Fixed bug #63219 (Segfault when aliasing trait method when autoloader throws excpetion)
exposing the libxpm version in phpinfo
5.4.9-dev
PHP-5.3 branch is 5.3.19 now
reverted the previous fix for libpng include
...