summaryrefslogtreecommitdiff
path: root/ext
Commit message (Expand)AuthorAgeFilesLines
* use ./tokenizer_data_gen.sh to for adding T_POW & T_POW_EQUALFerenc Kovacs2014-06-081-4/+4
* Fix bug #67392: token_name() does not return name for T_POW and T_POW_EQUAL t...Ferenc Kovacs2014-06-072-0/+19
* Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-06-051-2/+2
|\
| * Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2014-06-051-2/+2
| |\
| | * fix test for 5.4/5.5Remi Collet2014-06-051-2/+2
* | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-06-051-0/+35
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2014-06-051-0/+35
| |\ \ | | |/
| | * add test for previous fixRemi Collet2014-06-051-0/+35
* | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-06-052-12/+12
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2014-06-052-12/+12
| |\ \ | | |/
| | * Fix regression introduce in fix for bug #67118Remi Collet2014-06-052-12/+12
| * | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2014-06-033-38/+44
| |\ \ | | |/
| | * Fixed regression introduced by patch for bug #67072Anatol Belski2014-06-033-38/+44
* | | Fixed bug #67329 fileinfo: NULL pointer deference flaw by processing certain ...Anatol Belski2014-06-033-19/+68
* | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-06-031-2/+2
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2014-06-031-2/+2
| |\ \ | | |/
| | * Fix bug #67326 fileinfo: cdf_read_short_sector insufficient boundary checkRemi Collet2014-06-031-2/+2
* | | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2014-06-013-0/+32
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2014-06-013-0/+32
| |\ \ | | |/
| | * Fixed bug #67359 (Segfault in recursiveDirectoryIterator)Xinchen Hui2014-06-013-0/+32
* | | Merge branch 'PHP-5.5' into PHP-5.6Adam Harvey2014-05-292-1/+42
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Adam Harvey2014-05-292-1/+42
| |\ \ | | |/
| | * Check for zero-length keys in spl_array_skip_protected and don't skip them.Adam Harvey2014-05-292-1/+42
| * | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2014-05-271-4/+60
| |\ \ | | |/
| | * updated libmagic.patch for 5.4+Anatol Belski2014-05-271-66/+138
* | | updated libmagic.patch for 5.6+Anatol Belski2014-05-271-6/+62
* | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-05-272-2/+12
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-05-272-2/+12
| |\ \ | | |/
| | * Fix bug #67249: printf out-of-bounds readStanislav Malyshev2014-05-272-2/+12
| | * backport this piece from 5.6, related to the #66307 fixAnatol Belski2014-05-261-1/+2
| | * Fixed bug #66307 Fileinfo crashes with powerpoint filesAnatol Belski2014-05-263-2/+7
| * | Fix #50444: PDO-ODBC changes for 64-bitAndrew Kehrig2014-05-262-3/+3
* | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-05-261-13/+11
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-05-261-13/+11
| |\ \ | | |/
| | * Fix bug #67328 (fileinfo: numerous file_printf calls resulting in performance...Stanislav Malyshev2014-05-261-12/+4
| | * Fix bug #67327: fileinfo: CDF infinite loop in nelements DoSStanislav Malyshev2014-05-261-1/+7
* | | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2014-05-261-0/+25
|\ \ \ | |/ /
| * | Update NEWs and add a testXinchen Hui2014-05-261-0/+25
* | | Merge branch 'PHP-5.5' into PHP-5.6Dmitry Stogov2014-05-261-4/+25
|\ \ \ | |/ /
| * | Fixed issue #183 (TMP_VAR is not only used once)Dmitry Stogov2014-05-261-4/+25
* | | Merge branch 'PHP-5.5' into PHP-5.6Adam Harvey2014-05-233-30/+30
|\ \ \ | |/ /
| * | Further test fixes for the fdb2709 breakage.Adam Harvey2014-05-232-20/+20
| * | Merge branch 'PHP-5.4' into PHP-5.5Adam Harvey2014-05-231-10/+10
| |\ \ | | |/
| | * Fix broken test caused by fdb2709.Adam Harvey2014-05-231-10/+10
* | | Merge branch 'PHP-5.5' into PHP-5.6Adam Harvey2014-05-2148-384/+412
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Adam Harvey2014-05-2147-383/+411
| |\ \ | | |/
| | * Add microseconds to the serialised form of DateTime objects.Adam Harvey2014-05-2147-383/+411
* | | Merge branch 'PHP-5.5' into PHP-5.6Matteo Beccati2014-05-211-8/+27
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Matteo Beccati2014-05-211-8/+27
| |\ \ | | |/
| | * Improved test for bug #62479Matteo Beccati2014-05-211-8/+27