- fix very silly behaviour of libmagic if we want to get the mime type intead

[m6w6/ext-http] / http_api.c

diff --git a/http_api.c b/http_api.c
index 8bbb34ac785fd6cd636b664628c15e99bf84ec4f..eec41daa0d7068d964cc26ab7377e15dc6b78fba 100644 (file)
--- a/http_api.c
+++ b/http_api.c
@@ -85,7 +85,7 @@ STATUS _http_parse_key_list(const char *list, HashTable *items, char separator,
        int vallen = 0, keylen = 0, done = 0;
        zval array;
 
-       Z_ARRVAL(array) = items;
+       INIT_ZARR(array, items);
 
        if (!(val = strchr(list, '='))) {
                return FAILURE;
@@ -164,10 +164,9 @@ STATUS _http_parse_key_list(const char *list, HashTable *items, char separator,
 /* }}} */
 
 /* {{{ void http_error(long, long, char*) */
-void _http_error_ex(long type, long code, const char *format, ...)
+void _http_error_ex(long type TSRMLS_DC, long code, const char *format, ...)
 {
        va_list args;
-       TSRMLS_FETCH();
        
        va_start(args, format);
 #ifdef ZEND_ENGINE_2
@@ -359,15 +358,19 @@ PHP_HTTP_API char *_http_guess_content_type(const char *magicfile, long magicmod
        char *ct = NULL;
 
 #ifdef HTTP_HAVE_MAGIC
-       struct magic_set *magic = magic_open(magicmode);
+       /*      magic_load() fails if MAGIC_MIME is set because it 
+               cowardly adds .mime to the file name */
+       struct magic_set *magic = magic_open(magicmode &~ MAGIC_MIME);
        
        if (!magic) {
                http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Invalid magic mode: %ld", magicmode);
        } else if (-1 == magic_load(magic, magicfile)) {
-               http_error_ex(HE_WARNING, HTTP_E_RUNTIME, "Failed to load magic database '%s'", magicfile);
+               http_error_ex(HE_WARNING, HTTP_E_RUNTIME, "Failed to load magic database '%s' (%s)", magicfile, magic_error(magic));
        } else {
                const char *ctype = NULL;
                
+               magic_setflags(magic, magicmode);
+               
                switch (data_mode)
                {
                        case SEND_RSRC: