derick Tue Oct 18 11:04:07 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src NEWS
/php-src/ext/mime_magic mime_magic.c
Log:
- MFH: Fixed bug #33829 (mime_content_type() returns text/plain for gzip and
bzip files).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.138&r2=1.2027.2.139&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.138 php-src/NEWS:1.2027.2.139
--- php-src/NEWS:1.2027.2.138 Tue Oct 18 10:33:19 2005
+++ php-src/NEWS Tue Oct 18 11:04:04 2005
@@ -3,6 +3,7 @@
?? 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)
http://cvs.php.net/diff.php/php-src/ext/mime_magic/mime_magic.c?r1=1.42.2.2&r2=1.42.2.3&ty=u
Index: php-src/ext/mime_magic/mime_magic.c
diff -u php-src/ext/mime_magic/mime_magic.c:1.42.2.2
php-src/ext/mime_magic/mime_magic.c:1.42.2.3
--- php-src/ext/mime_magic/mime_magic.c:1.42.2.2 Tue Oct 18 08:41:29 2005
+++ php-src/ext/mime_magic/mime_magic.c Tue Oct 18 11:04:07 2005
@@ -15,7 +15,7 @@
| Author: Hartmut Holzgraefe <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mime_magic.c,v 1.42.2.2 2005/10/18 12:41:29 tony2001 Exp $
+ $Id: mime_magic.c,v 1.42.2.3 2005/10/18 15:04:07 derick Exp $
This module contains a lot of stuff taken from Apache mod_mime_magic,
so the license section is a little bit longer than usual:
@@ -434,9 +434,6 @@
/* parse it */
if (parse(line + ws_offset, lineno) != 0)
++errs;
-
- if(errs && !MIME_MAGIC_G(debug))
- break;
}
(void) fclose(f);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
