- MFH: Fixed bug #33829 (mime_content_type() returns text/plain for gzip and

  bzip files).

diff --git a/NEWS b/NEWS
index cbc195b5fc99f3862f88e574484f213cca1a1588..b2ef6b70e0cc768d0f01cbe8148806abe395d48d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ PHP                                                                        NEWS
 ?? Oct 2005, PHP 5.1 Release Candidate 4
 - Fixed bug #34902 (mysqli::character_set_name() - undefined method). (Tony)
 - Fixed bug #34899 (Fixed sqlite extension compile failure). ?(Ilia)
+- Fixed bug #33829 (mime_content_type() returns text/plain for gzip and bzip files). (Derick)
 
 17 Oct 2005, PHP 5.1 Release Candidate 3
 - Fixed bug #34873 (Segmentation Fault on foreach in object). (Dmitry)

diff --git a/ext/mime_magic/mime_magic.c b/ext/mime_magic/mime_magic.c
index 54bc33e6773f97e082e34aaa651b0f4734cd49e3..8c9b957ca268d45bcd622a172796357727787a61 100644 (file)
--- a/ext/mime_magic/mime_magic.c
+++ b/ext/mime_magic/mime_magic.c
@@ -434,9 +434,6 @@ static int apprentice(void)
                /* parse it */
                if (parse(line + ws_offset, lineno) != 0)
                        ++errs;
-
-               if(errs && !MIME_MAGIC_G(debug)) 
-                       break;
     }
 
     (void) fclose(f);