cvs: php4(PHP_4_3) /ext/mime_magic mime_magic.c
| From: | Stefan Esser | Date: | Mon, 23 Dec 2002 08:51:16 +0000 |
| Subject: | cvs: php4(PHP_4_3) /ext/mime_magic mime_magic.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-17388@lists.php.net to get a copy of this message | ||
sesser Mon Dec 23 03:51:16 2002 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/mime_magic mime_magic.c
Log:
MFH
Index: php4/ext/mime_magic/mime_magic.c
diff -u php4/ext/mime_magic/mime_magic.c:1.13.2.4 php4/ext/mime_magic/mime_magic.c:1.13.2.5
--- php4/ext/mime_magic/mime_magic.c:1.13.2.4 Mon Nov 18 16:23:11 2002
+++ php4/ext/mime_magic/mime_magic.c Mon Dec 23 03:51:16 2002
@@ -15,7 +15,7 @@
| Author: Hartmut Holzgraefe <hartmut@six.de> |
+----------------------------------------------------------------------+
- $Id: mime_magic.c,v 1.13.2.4 2002/11/18 21:23:11 moriyoshi Exp $
+ $Id: mime_magic.c,v 1.13.2.5 2002/12/23 08:51:16 sesser 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:
@@ -358,7 +358,7 @@
fname = conf->magicfile; /* todo cwd? */
f = fopen(fname, "rb");
if (f == NULL) {
- (int) conf->magic = -1;
+ *(int *)&conf->magic = -1;
return -1;
}