clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 02:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
82,972 Commits 491 Branches 1,363 Tags 841 MiB
bbce94ed78
Commit Graph

6 Commits

Author SHA1 Message Date
Anatol Belski
c9d0894ec5 Fixed bug #67647 Bundled libmagic 5.17 does not detect quicktime files correctly 2015-01-22 11:48:11 +01:00
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:
ef2329cf71

Add the magicdata.patch to track patches applied to upstream data file.
 2014-03-25 10:58:50 +01:00