summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 5.5.11 finalphp-5.5.11PHP-5.5.11Julien Pauli2014-04-013-4/+8
* Fixed bug #66946 extensive backtracking in awk rule regular expressionRemi Collet2014-04-011-0/+39
* Fixed bug #66946 extensive backtracking in awk rule regular expressionRemi Collet2014-04-011-7136/+7136
* 5.5.11RC1php-5.5.11RC1Julien Pauli2014-03-193-4/+4
* Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-03-180-0/+0
|\
| * prep for 5.4.27 rc1Stanislav Malyshev2014-03-183-9/+11
* | Merge branch 'PHP-5.4' into PHP-5.5Derick Rethans2014-03-181-207/+207
|\ \ | |/
| * - Updated to version 2014.1 (2014a)Derick Rethans2014-03-181-207/+207
* | Add a testAndrey Hristov2014-03-181-0/+140
* | Merge branch 'PHP-5.4' into PHP-5.5Mateusz Kocielski2014-03-181-2/+2
|\ \ | |/
| * Merge branch 'PHP-5.3' into PHP-5.4Mateusz Kocielski2014-03-181-2/+2
| |\
| | * Fixed off-by-one in php_url_parse_exMateusz Kocielski2014-03-181-1/+1
* | | Fix bug #66873: check if obj->src is setStanislav Malyshev2014-03-173-7/+32
* | | NEWSRemi Collet2014-03-141-0/+3
* | | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2014-03-142-2/+1
|\ \ \ | |/ /
| * | NEWSRemi Collet2014-03-141-1/+4
| * | Fixed Bug #66833 Default digest algo is still MD5Remi Collet2014-03-142-2/+1
* | | Fix 5.5.10 NEWSDavid Zülke2014-03-131-4/+4
* | | Merge branch 'PHP-5.4' into PHP-5.5Lior Kaplan2014-03-131-1/+1
|\ \ \ | |/ /
| * | Typo fix: sicret -> secretMichael Meyer2014-03-131-1/+1
* | | updated libs_version.txtAnatol Belski2014-03-131-2/+2
* | | made libgd recognize the 9 version seriesAnatol Belski2014-03-121-0/+4
* | | NEWSRemi Collet2014-03-121-0/+2
* | | Fix bug #66887 imagescale - poor quality of scaled imageRemi Collet2014-03-121-6/+6
* | | Fixed Bug #66893i imagescale ignore method argumentRemi Collet2014-03-122-28/+5
* | | Fix hash_pbkdf2() with missing $length argumentNikita Popov2014-03-123-7/+14
* | | typo in NEWSRemi Collet2014-03-121-3/+3
* | | NEWSRemi Collet2014-03-121-0/+1
* | | Fixed Bug #66890 imagescale segfaultRemi Collet2014-03-121-3/+7
* | | 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