Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | use ./tokenizer_data_gen.sh to for adding T_POW & T_POW_EQUAL | Ferenc Kovacs | 2014-06-08 | 1 | -4/+4 |
* | Fix bug #67392: token_name() does not return name for T_POW and T_POW_EQUAL t... | Ferenc Kovacs | 2014-06-07 | 2 | -0/+19 |
* | Merge branch 'PHP-5.5' into PHP-5.6 | Remi Collet | 2014-06-05 | 1 | -2/+2 |
|\ | |||||
| * | Merge branch 'PHP-5.4' into PHP-5.5 | Remi Collet | 2014-06-05 | 1 | -2/+2 |
| |\ | |||||
| | * | fix test for 5.4/5.5 | Remi Collet | 2014-06-05 | 1 | -2/+2 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Remi Collet | 2014-06-05 | 1 | -0/+35 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Remi Collet | 2014-06-05 | 1 | -0/+35 |
| |\ \ | | |/ | |||||
| | * | add test for previous fix | Remi Collet | 2014-06-05 | 1 | -0/+35 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Remi Collet | 2014-06-05 | 2 | -12/+12 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Remi Collet | 2014-06-05 | 2 | -12/+12 |
| |\ \ | | |/ | |||||
| | * | Fix regression introduce in fix for bug #67118 | Remi Collet | 2014-06-05 | 2 | -12/+12 |
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Anatol Belski | 2014-06-03 | 3 | -38/+44 |
| |\ \ | | |/ | |||||
| | * | Fixed regression introduced by patch for bug #67072 | Anatol Belski | 2014-06-03 | 3 | -38/+44 |
* | | | Fixed bug #67329 fileinfo: NULL pointer deference flaw by processing certain ... | Anatol Belski | 2014-06-03 | 3 | -19/+68 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Remi Collet | 2014-06-03 | 1 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Remi Collet | 2014-06-03 | 1 | -2/+2 |
| |\ \ | | |/ | |||||
| | * | Fix bug #67326 fileinfo: cdf_read_short_sector insufficient boundary check | Remi Collet | 2014-06-03 | 1 | -2/+2 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Xinchen Hui | 2014-06-01 | 3 | -0/+32 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Xinchen Hui | 2014-06-01 | 3 | -0/+32 |
| |\ \ | | |/ | |||||
| | * | Fixed bug #67359 (Segfault in recursiveDirectoryIterator) | Xinchen Hui | 2014-06-01 | 3 | -0/+32 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Adam Harvey | 2014-05-29 | 2 | -1/+42 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Adam Harvey | 2014-05-29 | 2 | -1/+42 |
| |\ \ | | |/ | |||||
| | * | Check for zero-length keys in spl_array_skip_protected and don't skip them. | Adam Harvey | 2014-05-29 | 2 | -1/+42 |
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Anatol Belski | 2014-05-27 | 1 | -4/+60 |
| |\ \ | | |/ | |||||
| | * | updated libmagic.patch for 5.4+ | Anatol Belski | 2014-05-27 | 1 | -66/+138 |
* | | | updated libmagic.patch for 5.6+ | Anatol Belski | 2014-05-27 | 1 | -6/+62 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2014-05-27 | 2 | -2/+12 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-05-27 | 2 | -2/+12 |
| |\ \ | | |/ | |||||
| | * | Fix bug #67249: printf out-of-bounds read | Stanislav Malyshev | 2014-05-27 | 2 | -2/+12 |
| | * | backport this piece from 5.6, related to the #66307 fix | Anatol Belski | 2014-05-26 | 1 | -1/+2 |
| | * | Fixed bug #66307 Fileinfo crashes with powerpoint files | Anatol Belski | 2014-05-26 | 3 | -2/+7 |
| * | | Fix #50444: PDO-ODBC changes for 64-bit | Andrew Kehrig | 2014-05-26 | 2 | -3/+3 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2014-05-26 | 1 | -13/+11 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-05-26 | 1 | -13/+11 |
| |\ \ | | |/ | |||||
| | * | Fix bug #67328 (fileinfo: numerous file_printf calls resulting in performance... | Stanislav Malyshev | 2014-05-26 | 1 | -12/+4 |
| | * | Fix bug #67327: fileinfo: CDF infinite loop in nelements DoS | Stanislav Malyshev | 2014-05-26 | 1 | -1/+7 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Xinchen Hui | 2014-05-26 | 1 | -0/+25 |
|\ \ \ | |/ / | |||||
| * | | Update NEWs and add a test | Xinchen Hui | 2014-05-26 | 1 | -0/+25 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Dmitry Stogov | 2014-05-26 | 1 | -4/+25 |
|\ \ \ | |/ / | |||||
| * | | Fixed issue #183 (TMP_VAR is not only used once) | Dmitry Stogov | 2014-05-26 | 1 | -4/+25 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Adam Harvey | 2014-05-23 | 3 | -30/+30 |
|\ \ \ | |/ / | |||||
| * | | Further test fixes for the fdb2709 breakage. | Adam Harvey | 2014-05-23 | 2 | -20/+20 |
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Adam Harvey | 2014-05-23 | 1 | -10/+10 |
| |\ \ | | |/ | |||||
| | * | Fix broken test caused by fdb2709. | Adam Harvey | 2014-05-23 | 1 | -10/+10 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Adam Harvey | 2014-05-21 | 48 | -384/+412 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Adam Harvey | 2014-05-21 | 47 | -383/+411 |
| |\ \ | | |/ | |||||
| | * | Add microseconds to the serialised form of DateTime objects. | Adam Harvey | 2014-05-21 | 47 | -383/+411 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Matteo Beccati | 2014-05-21 | 1 | -8/+27 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Matteo Beccati | 2014-05-21 | 1 | -8/+27 |
| |\ \ | | |/ | |||||
| | * | Improved test for bug #62479 | Matteo Beccati | 2014-05-21 | 1 | -8/+27 |