X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_send_api.c;h=cfb088ae4929d40bbdcdd93c72aff7cf324ae95d;hb=14819be2113881e1030d23c6a1a32e17083ab406;hp=8b2567437b625ce8af5035a67d9da404e910ad4d;hpb=edc84b40eb2c5be04492fa98fec5833a030782eb;p=m6w6%2Fext-http

diff --git a/http_send_api.c b/http_send_api.c
index 8b25674..cfb088a 100644
--- a/http_send_api.c
+++ b/http_send_api.c
@@ -32,7 +32,7 @@
 
 ZEND_EXTERN_MODULE_GLOBALS(http);
 
-#define http_flush(d, l) _http_flush((d), (l) SRMLS_CC)
+#define http_flush(d, l) _http_flush((d), (l) TSRMLS_CC)
 /* {{{ static inline void http_flush() */
 static inline void _http_flush(const char *data, size_t data_len TSRMLS_DC)
 {
@@ -456,9 +456,13 @@ PHP_HTTP_API char *_http_guess_content_type(const char *magicfile, long magicmod
 	char *ct = NULL;
 
 #ifdef HTTP_HAVE_MAGIC
+	struct magic_set *magic;
+	
+	HTTP_CHECK_OPEN_BASEDIR(magicfile, return NULL);
+	
 	/*	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);
+	magic = magic_open(magicmode &~ MAGIC_MIME);
 	
 	if (!magic) {
 		http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Invalid magic mode: %ld", magicmode);
@@ -487,6 +491,7 @@ PHP_HTTP_API char *_http_guess_content_type(const char *magicfile, long magicmod
 			break;
 			
 			default:
+				HTTP_CHECK_OPEN_BASEDIR(data_ptr, magic_close(magic); return NULL);
 				ctype = magic_file(magic, data_ptr);
 			break;
 		}