cvs: php4 /ext/mime_magic mime_magic.c
| From: | Sander Roobol | Date: | Thu, 20 Jun 2002 20:13:20 +0000 |
| Subject: | cvs: php4 /ext/mime_magic mime_magic.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-12428@lists.php.net to get a copy of this message | ||
sander Thu Jun 20 16:13:20 2002 EDT
Modified files:
/php4/ext/mime_magic mime_magic.c
Log:
ZTS fixes
# if this breaks something, please let me know... i've got really no
# idea what i'm doing but this fixes the ZTS build :)
Index: php4/ext/mime_magic/mime_magic.c
diff -u php4/ext/mime_magic/mime_magic.c:1.6 php4/ext/mime_magic/mime_magic.c:1.7
--- php4/ext/mime_magic/mime_magic.c:1.6 Tue Jun 11 05:37:31 2002
+++ php4/ext/mime_magic/mime_magic.c Thu Jun 20 16:13:20 2002
@@ -15,7 +15,7 @@
| Author: Hartmut Holzgraefe <hartmut@six.de> |
+----------------------------------------------------------------------+
- $Id: mime_magic.c,v 1.6 2002/06/11 09:37:31 hholzgra Exp $
+ $Id: mime_magic.c,v 1.7 2002/06/20 20:13:20 sander Exp $
This module contains a lot of stuff taken from Apache mod_mime_magic,
so the lincense section is a little bit longer than usual:
@@ -949,6 +949,7 @@
unsigned char buf[HOWMANY + 1]; /* one extra for terminating '\0' */
int nbytes = 0; /* number of bytes read from a datafile */
int result;
+ TSRMLS_FETCH();
/*
* first try judging the file based on its filesystem status
@@ -1035,6 +1036,7 @@
static int fsmagic(char *filename)
{
php_stream_statbuf stat_ssb;
+ TSRMLS_FETCH();
if(!php_stream_stat_path(filename, &stat_ssb)) {
return MIME_MAGIC_OK;