tony2001 Tue Oct 18 08:41:14 2005 EDT
Modified files:
/php-src/ext/mime_magic mime_magic.c phpmimemagic.h
Log:
fix mime_magic problems with ZTS
http://cvs.php.net/diff.php/php-src/ext/mime_magic/mime_magic.c?r1=1.43&r2=1.44&ty=u
Index: php-src/ext/mime_magic/mime_magic.c
diff -u php-src/ext/mime_magic/mime_magic.c:1.43
php-src/ext/mime_magic/mime_magic.c:1.44
--- php-src/ext/mime_magic/mime_magic.c:1.43 Fri Oct 14 11:38:56 2005
+++ php-src/ext/mime_magic/mime_magic.c Tue Oct 18 08:41:13 2005
@@ -15,7 +15,7 @@
| Author: Hartmut Holzgraefe <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mime_magic.c,v 1.43 2005/10/14 15:38:56 iliaa Exp $
+ $Id: mime_magic.c,v 1.44 2005/10/18 12:41:13 tony2001 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:
@@ -260,7 +260,9 @@
*/
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 @@
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 @@
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;
http://cvs.php.net/diff.php/php-src/ext/mime_magic/phpmimemagic.h?r1=1.3&r2=1.4&ty=u
Index: php-src/ext/mime_magic/phpmimemagic.h
diff -u php-src/ext/mime_magic/phpmimemagic.h:1.3
php-src/ext/mime_magic/phpmimemagic.h:1.4
--- php-src/ext/mime_magic/phpmimemagic.h:1.3 Wed Aug 3 10:07:26 2005
+++ php-src/ext/mime_magic/phpmimemagic.h Tue Oct 18 08:41:13 2005
@@ -15,7 +15,7 @@
| Author: |
+----------------------------------------------------------------------+
- $Id: phpmimemagic.h,v 1.3 2005/08/03 14:07:26 sniper Exp $
+ $Id: phpmimemagic.h,v 1.4 2005/10/18 12:41:13 tony2001 Exp $
*/
#ifndef PHPMIMEMAGIC_H
@@ -343,7 +343,6 @@
/* 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;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
