X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_send_api.c;h=587870f8a85fb170ec408dc5aedd30eab7b4b22e;hp=1a7765282ee8afa88a302f87040b5eddf19da48b;hb=1374172d6c717de67faf91519b100b5348329aee;hpb=98d8a1dced6ae8bde1953f439de7fd9c453e5971

diff --git a/http_send_api.c b/http_send_api.c
index 1a77652..587870f 100644
--- a/http_send_api.c
+++ b/http_send_api.c
@@ -455,6 +455,16 @@ PHP_HTTP_API STATUS _http_send_stream_ex(php_stream *file, zend_bool close_strea
 	php_stream_statbuf ssb;
 
 	if ((!file) || php_stream_stat(file, &ssb)) {
+		char *defct = sapi_get_default_content_type(TSRMLS_C);
+		
+		http_send_content_type(defct, strlen(defct));
+		http_send_header_string("Content-Disposition:");
+		http_error(HE_WARNING, HTTP_E_RESPONSE, "File not found; stat failed");
+		STR_FREE(defct);
+		
+		if (HTTP_G->send.not_found_404) {
+			http_exit_ex(404, NULL, estrdup("File not found\n"), 0);
+		}
 		return FAILURE;
 	}
 
@@ -474,15 +484,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;
+	struct magic_set *magic = NULL;
 	
 	HTTP_CHECK_OPEN_BASEDIR(magicfile, return NULL);
 	
-	/*	magic_load() fails if MAGIC_MIME is set because it 
-		cowardly adds .mime to the file name */
-	magic = magic_open(magicmode &~ MAGIC_MIME);
-	
-	if (!magic) {
+	if (!data_ptr) {
+		http_error(HE_WARNING, HTTP_E_INVALID_PARAM, "Supplied payload is empty");
+	} else if (!(magic = magic_open(magicmode &~ MAGIC_MIME))) {
 		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' (%s)", magicfile, magic_error(magic));