Merge branch 'master' of https://git.php.net/repository/php-src
# By Andrey Hristov (3) and Anatol Belski (1)
# Via Andrey Hristov (8) and others
* 'master' of https://git.php.net/repository/php-src:
inject it directly. This is not C++ and I don't want to use hacks with similar structures that are binary compatible. Better be explicit.
updated libsqlite to 3.8.3.1 in 5.5 branch, too
DI
Switch from a single flag to a flag byte
Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6
# By Pierre Joye (7) and others
# Via Pierre Joye (10) and others
* 'PHP-5.6' of https://git.php.net/repository/php-src:
updated libsqlite to 3.8.3.1 in 5.5 branch, too
DI
Switch from a single flag to a flag byte
update NEWS
fix #66872, invalid argument crashes gmp_testbit
fix #66872, invalid argument crashes gmp_testbit
update news
- fix #66869, Invalid 2nd argument crashes imageaffinematrixget
add vc12 (2013)
add vc12 (2013)
Pierre Joye [Mon, 10 Mar 2014 15:30:05 +0000 (16:30 +0100)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
# By Anatol Belski (1) and others
# Via Anatol Belski
* 'PHP-5.5' of git.php.net:php-src:
updated libmagic.patch
Fix indentation
Do not remove *.1, it's not generated by make but configure
Pierre Joye [Mon, 10 Mar 2014 15:28:41 +0000 (16:28 +0100)]
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
# By Anatol Belski (2) and others
# Via Anatol Belski (3) and others
* 'PHP-5.6' of git.php.net:php-src:
updated libmagic.patch
updated libmagic.patch
Fix indentation
Do not remove *.1, it's not generated by make but configure
Fix typo: entory -> entry
Pierre Joye [Mon, 10 Mar 2014 11:19:32 +0000 (12:19 +0100)]
Merge branch 'master' of git.php.net:php-src
# By Andrey Hristov (1) and others
# Via Andrey Hristov (3) and others
* 'master' of git.php.net:php-src:
Fix indentation
Do not remove *.1, it's not generated by make but configure
Fix typo: entory -> entry
Pierre Joye [Mon, 10 Mar 2014 11:04:04 +0000 (12:04 +0100)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
# By Dmitry Panin (1) and Remi Collet (1)
# Via Nikita Popov
* 'PHP-5.4' of git.php.net:php-src:
Fix HTML entity table generation
Set default Digest Message to use SHA1 instead of MD5 in openssl tests as MD5 signature are now rejected by newer openssl Version.
Pierre Joye [Sun, 9 Mar 2014 20:11:19 +0000 (21:11 +0100)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
# By Remi Collet (6) and others
# Via Nikita Popov (1) and others
* 'PHP-5.5' of git.php.net:php-src:
Fixed null termination
Updated NEWS for #65545
Add fread(length) method
Fix HTML entity table generation
Fix order in NEWS
Add CVE ref (not known at release time)
Fix NEWS for 5.5.11 fix (really not in 5.5.10)
5.5.10 release date for NEWS
Set default Digest Message to use SHA1 instead of MD5 in openssl tests as MD5 signature are now rejected by newer openssl Version.
NEWS
Fixed Bug #66815 imagecrop(): insufficient fix for NULL defer CVE-2013-7327
Pierre Joye [Sun, 9 Mar 2014 16:06:57 +0000 (17:06 +0100)]
Merge branch 'master' of git.php.net:php-src
# By Nikita Popov (10) and others
# Via Remi Collet (9) and others
* 'master' of git.php.net:php-src: (41 commits)
updated NEWS
removed the libsqlite patch as it's not relevant anymore
updated bundled libsqlite to 3.8.3.1
Fixed mcrypt test case
add OPSYS_Z_CPM missing constant
Update php.ini files (new openssl directives)
Fixed null termination
Updated NEWS for #65545
Updated NEWS for #65545
Add fread(length) method
Updated news for #66822
Allow T_POW in constant expressions
Fix typo
Fix #66698: Add fnv1a32 and fnv1a64 hash options
Fix HTML entity table generation
Add test for bug #62102 / RFC 2144
Whitespace.
Misc cleanup including adding the version number
Fix order in NEWS
Add CVE ref (not known at release time)
...
Remi Collet [Thu, 6 Mar 2014 09:16:40 +0000 (10:16 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Set default Digest Message to use SHA1 instead of MD5 in openssl tests as MD5 signature are now rejected by newer openssl Version.
Add NEWS/UPGRADING notes (openssl + curl)
projects / php / log