iliaa Fri Oct 14 11:38:58 2005 EDT
Modified files:
/php-src/ext/mime_magic mime_magic.c
Log:
MFB51: ZTS fix
http://cvs.php.net/diff.php/php-src/ext/mime_magic/mime_magic.c?r1=1.42&r2=1.43&ty=u
Index: php-src/ext/mime_magic/mime_magic.c
diff -u php-src/ext/mime_magic/mime_magic.c:1.42
php-src/ext/mime_magic/mime_magic.c:1.43
--- php-src/ext/mime_magic/mime_magic.c:1.42 Wed Aug 3 10:07:26 2005
+++ php-src/ext/mime_magic/mime_magic.c Fri Oct 14 11:38:56 2005
@@ -15,7 +15,7 @@
| Author: Hartmut Holzgraefe <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mime_magic.c,v 1.42 2005/08/03 14:07:26 sniper Exp $
+ $Id: mime_magic.c,v 1.43 2005/10/14 15:38:56 iliaa 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:
@@ -271,9 +271,7 @@
ZEND_INIT_MODULE_GLOBALS(mime_magic, php_mime_magic_init_globals, NULL);
REGISTER_INI_ENTRIES();
- mime_global.magicfile = MIME_MAGIC_G(magicfile);
-
- if(mime_global.magicfile) {
+ if (MIME_MAGIC_G(magicfile)) {
if(apprentice()) {
MIME_MAGIC_G(status) = "invalid magic file, disabled";
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
