From: Antony Dovgal <tony2001@php.net>
Date: Tue, 18 Oct 2005 12:41:29 +0000 (+0000)
Subject: MFH: fix mime_magic problems with ZTS
X-Git-Tag: php-5.1.0RC4~86
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bddc4e6c1d6131ec32809523f4a35d5834417393;p=php

MFH: fix mime_magic problems with ZTS
---

diff --git a/ext/mime_magic/mime_magic.c b/ext/mime_magic/mime_magic.c
index 8bec0be88c..54bc33e677 100644
--- a/ext/mime_magic/mime_magic.c
+++ b/ext/mime_magic/mime_magic.c
@@ -260,7 +260,9 @@ PHP_INI_END()
  */
 static void php_mime_magic_init_globals(zend_mime_magic_globals *mime_magic_globals)
 {
-	mime_global.magicfile = NULL;
+	memset(mime_magic_globals, 0, sizeof(zend_mime_magic_globals));
+	mime_global.magic = NULL;
+	mime_global.last = NULL;
 }
 /* }}} */
 
@@ -348,7 +350,7 @@ PHP_FUNCTION(mime_content_type)
 
 	if (conf->magic == (struct magic *)-1) {
 		if(MIME_MAGIC_G(debug))
-			php_error_docref("http://www.php.net/mime_magic" TSRMLS_CC, E_ERROR, "mime_magic could not be initialized, magic file %s is not available", conf->magicfile);
+			php_error_docref("http://www.php.net/mime_magic" TSRMLS_CC, E_ERROR, "mime_magic could not be initialized, magic file %s is not available", MIME_MAGIC_G(magicfile));
 		RETURN_FALSE;
 	} 
 
@@ -391,7 +393,11 @@ static int apprentice(void)
     magic_server_config_rec *conf = &mime_global;
     TSRMLS_FETCH();
 
-    fname = conf->magicfile; /* todo cwd? */
+    if (!MIME_MAGIC_G(magicfile)) {
+        return -1;
+    }
+	
+    fname = MIME_MAGIC_G(magicfile); /* todo cwd? */
     f = fopen(fname, "rb");
     if (f == NULL) {
 		conf->magic = (struct magic *)-1;
diff --git a/ext/mime_magic/phpmimemagic.h b/ext/mime_magic/phpmimemagic.h
index 72d29ac6fa..9849030f92 100644
--- a/ext/mime_magic/phpmimemagic.h
+++ b/ext/mime_magic/phpmimemagic.h
@@ -343,7 +343,6 @@ typedef struct magic_rsl_s {
 
 /* per-server info */
 typedef struct {
-    char *magicfile;		/* where magic be found */
     struct magic *magic;	/* head of magic config list */
     struct magic *last;
 } magic_server_config_rec;