Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into test | Dmitry Stogov | 2014-08-11 | 4 | -12/+110 |
|\ | |||||
| * | Fix bug #67705 (extensive backtracking in rule regular expression) | Stanislav Malyshev | 2014-08-04 | 4 | -13/+109 |
* | | Partial fix that allows internal constructors to set $this to null. | Dmitry Stogov | 2014-07-09 | 1 | -0/+1 |
* | | Merge branch 'master' into test | Dmitry Stogov | 2014-07-07 | 1 | -27/+296 |
|\ \ | |/ | |||||
| * | updated libmagic.patch in 5.6+ | Anatol Belski | 2014-07-01 | 1 | -27/+296 |
* | | Merge branch 'master' into phpng | Dmitry Stogov | 2014-06-12 | 2 | -9/+24 |
|\ \ | |/ | |||||
| * | Merge branch 'PHP-5.5' into PHP-5.6 | Remi Collet | 2014-06-10 | 1 | -1/+5 |
| |\ | |||||
| | * | Merge branch 'PHP-5.4' into PHP-5.5 | Remi Collet | 2014-06-10 | 1 | -1/+5 |
| | |\ | |||||
| | | * | Fixed Bug #67413 fileinfo: cdf_read_property_info insufficient boundary chec | Remi Collet | 2014-06-10 | 1 | -1/+5 |
| * | | | Merge branch 'PHP-5.5' into PHP-5.6 | Remi Collet | 2014-06-10 | 1 | -3/+4 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch 'PHP-5.4' into PHP-5.5 | Remi Collet | 2014-06-10 | 1 | -3/+4 |
| | |\ \ | | | |/ | |||||
| | | * | Bug #67412 fileinfo: cdf_count_chain insufficient boundary check | Remi Collet | 2014-06-10 | 1 | -3/+4 |
| * | | | Merge branch 'PHP-5.5' into PHP-5.6 | Remi Collet | 2014-06-10 | 1 | -2/+4 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch 'PHP-5.4' into PHP-5.5 | Remi Collet | 2014-06-10 | 1 | -2/+4 |
| | |\ \ | | | |/ | |||||
| | | * | Fixed Bug #67411 fileinfo: cdf_check_stream_offset insufficient boundary check | Remi Collet | 2014-06-10 | 1 | -2/+4 |
| * | | | Merge branch 'PHP-5.5' into PHP-5.6 | Remi Collet | 2014-06-10 | 1 | -3/+11 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch 'PHP-5.4' into PHP-5.5 | Remi Collet | 2014-06-10 | 1 | -3/+11 |
| | |\ \ | | | |/ | |||||
| | | * | Fixed Bug #67410 fileinfo: mconvert incorrect handling of truncated pascal st... | Remi Collet | 2014-06-10 | 1 | -3/+11 |
* | | | | Merge branch 'master' into phpng | Dmitry Stogov | 2014-06-05 | 3 | -21/+70 |
|\ \ \ \ | |/ / / | |||||
| * | | | 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.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 |
| | | * | 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 |
* | | | | Merge branch 'master' into phpng | Xinchen Hui | 2014-06-01 | 2 | -19/+73 |
|\ \ \ \ | |/ / / | |||||
| * | | | 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-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 |
| | * | | updated libmagic.patch | Anatol Belski | 2014-04-24 | 1 | -63/+79 |
| | * | | backport this piece from 5.6, related to the #66307 fix | Anatol Belski | 2014-04-24 | 1 | -1/+2 |
* | | | | Fixed ext/fileinfo conversion mistakes | Dmitry Stogov | 2014-05-07 | 1 | -14/+29 |
* | | | | Refactor fileinfo | Xinchen Hui | 2014-05-07 | 3 | -208/+145 |
|/ / / | |||||
* | | | updated libmagic.patch | Anatol Belski | 2014-05-04 | 1 | -0/+12 |
* | | | added missing stdint header, bug #66907 | Anatol Belski | 2014-05-04 | 1 | -0/+2 |
* | | | updated libmagic.patch for 5.6+ | Anatol Belski | 2014-04-24 | 1 | -4/+12 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2014-04-24 | 3 | -1/+5 |
|\ \ \ | |/ / | |||||
| * | | Fixed bug #66307 Fileinfo crashes with powerpoint files | Anatol Belski | 2014-04-24 | 3 | -2/+7 |
* | | | Fixed bug #66907 Solaris 10 is missing strcasestr and needs substitute | Anatol Belski | 2014-04-15 | 2 | -0/+117 |
* | | | updated libmagic.patch | Anatol Belski | 2014-03-31 | 1 | -53/+57 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Remi Collet | 2014-03-31 | 1 | -6/+8 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Remi Collet | 2014-03-31 | 1 | -6/+8 |
| |\ \ | | |/ | |||||
| | * | Fixed Bug #66987 Memory corruption in fileinfo ext (bigendian) | Remi Collet | 2014-03-31 | 1 | -6/+8 |
* | | | fix merge issue | Remi Collet | 2014-03-25 | 1 | -1000000/+175247 |
* | | | Fix merge (5.6 already have file 5.17) | Remi Collet | 2014-03-25 | 2 | -175247/+1000004 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Remi Collet | 2014-03-25 | 2 | -7136/+7175 |
| |\ \ | | |/ |