 Anatol Belski
|
41a2f7074d
|
Fixed bug #68398 msooxml matches too many archives
|
2014-12-06 20:51:00 +01:00 |
|
|
Andrey Hristov
|
3dc9bef819
|
Merge branch 'PHP-5.5' into PHP-5.6
Conflicts:
ext/fileinfo/data_file.c
ext/fileinfo/libmagic/softmagic.c
ext/fileinfo/magicdata.patch
|
2014-08-06 16:25:12 +03:00 |
|
|
Stanislav Malyshev
|
eeaec70758
|
Fix bug #67705 (extensive backtracking in rule regular expression)
|
2014-08-04 00:05:40 -07:00 |
|
|
Remi Collet
|
64d7dd55d3
|
Fix merge (5.6 already have file 5.17)
|
2014-03-25 11:03:59 +01:00 |
|
|
Remi Collet
|
1df558c6a0
|
Fixed bug #66946 extensive backtracking in awk rule regular expression
CVE-2013-7345
Applied upstream patch:
https://github.com/file/file/commit/ef2329cf71acb59204dd981e2c6cce6c81fe467c
Add the magicdata.patch to track patches applied to upstream data file.
|
2014-03-25 10:58:50 +01:00 |
|