summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix compile error with theoretically supported versions of libcurl < 7.12.3.Adam Harvey2014-03-112-0/+4
* Merge branch 'PHP-5.4' into PHP-5.5Tjerk Meesters2014-03-111-12/+11
|\
| * Removed bogus loopsTjerk Meesters2014-03-111-12/+11
* | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2014-03-111-7/+10
|\ \ | |/
| * restored the old code in 5.4/5 related to bug #66872Anatol Belski2014-03-111-7/+10
| * Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4Christopher Jones2014-03-103-15/+20
| |\
| | * Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4Pierre Joye2014-03-101-22/+154
| | |\ | | |/ | |/|
* | | Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5Christopher Jones2014-03-108-18669/+36696
|\ \ \
| * | | updated libsqlite to 3.8.3.1 in 5.5 branch, tooAnatol Belski2014-03-105-18660/+36683
| * | | Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5Pierre Joye2014-03-103-25/+157
| |\ \ \ | |/ / / |/| | |
* | | | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2014-03-101-22/+154
|\ \ \ \ | | |/ / | |/| |
| * | | updated libmagic.patchAnatol Belski2014-03-101-22/+154
* | | | Fix indentationAndrey Hristov2014-03-101-2/+3
* | | | Do not remove *.1, it's not generated by make but configureXinchen Hui2014-03-101-1/+0
| | * | update NEWSPierre Joye2014-03-101-0/+2
| | * | Merge branch 'PHP-5.4' into PHP-5.5Pierre Joye2014-03-102-10/+8
| | |\ \ | | | |/
| | | * fix #66872, invalid argument crashes gmp_testbitPierre Joye2014-03-101-6/+9
| | | * fix #66872, invalid argument crashes gmp_testbitPierre Joye2014-03-101-9/+7
| | | * Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4Pierre Joye2014-03-105-7/+11
| | | |\ | | |_|/ | |/| |
| | | * Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4Pierre Joye2014-03-051025-2910/+5694
| | | |\
| | | * | add vc12 (2013)Pierre Joye2013-11-041-0/+4
| | * | | update newsPierre Joye2014-03-091-0/+1
| | * | | - fix #66869, Invalid 2nd argument crashes imageaffinematrixgetPierre Joye2014-03-091-0/+1
| | * | | Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5Pierre Joye2014-03-0910-31/+106
| | |\ \ \ | |_|/ / / |/| | | |
* | | | | Fixed null terminationTjerk Meesters2014-03-072-1/+7
* | | | | Updated NEWS for #65545Tjerk Meesters2014-03-071-0/+3
* | | | | Add fread(length) methoddatibbaw2014-03-072-0/+49
* | | | | Merge branch 'PHP-5.4' into PHP-5.5Nikita Popov2014-03-064-7/+10
|\ \ \ \ \ | |/ / / /
| * | | | Fix HTML entity table generationDmitry Panin2014-03-064-7/+10
* | | | | Fix order in NEWSRemi Collet2014-03-061-10/+10
* | | | | Add CVE ref (not known at release time)Remi Collet2014-03-061-1/+2
* | | | | Fix NEWS for 5.5.11 fix (really not in 5.5.10)Remi Collet2014-03-061-5/+8
* | | | | 5.5.10 release date for NEWSJulien Pauli2014-03-061-1/+1
* | | | | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2014-03-061-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Set default Digest Message to use SHA1 instead of MD5 in openssl testsRemi Collet2014-03-061-0/+1
| | |_|/ | |/| |
* | | | NEWSRemi Collet2014-03-051-0/+2
* | | | Fixed Bug #66815 imagecrop(): insufficient fix for NULL defer CVE-2013-7327Remi Collet2014-03-052-9/+16
| | * | Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5Pierre Joye2014-03-051252-11281/+31196
| | |\ \ | |_|/ / |/| | |
* | | | NEWSRemi Collet2014-03-041-0/+1
* | | | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2014-03-041-16/+18
|\ \ \ \ | |/ / /
| * | | NEWSRemi Collet2014-03-041-0/+1
| * | | Fixed Bug #66820 out-of-bounds memory access in fileinfoRemi Collet2014-03-041-16/+18
* | | | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2014-03-041-4/+12
|\ \ \ \ | |/ / /
| * | | Improves fix for memory leak, keep in sync with upstream.Remi Collet2014-03-041-4/+12
* | | | Fixed news for #60602Tjerk Meesters2014-03-031-1/+1
* | | | Merge branch 'PHP-5.4' into PHP-5.5Tjerk Meesters2014-03-032-8/+86
|\ \ \ \ | |/ / /
| * | | Updated news for #60602Tjerk Meesters2014-03-031-1/+5
| * | | proc_open(): separate environment values that aren't stringsTjerk Meesters2014-03-032-8/+86
| * | | Updated NEWS for #66535Tjerk Meesters2014-03-011-0/+2
* | | | Fixed NEWS.Derick Rethans2014-03-021-6/+6