Merge pull request #1642 from rexso/master

Respect explicitly set Content-Type in sendFile
vibe-d · Dec 16, 2016 · e580c1b · e580c1b
2 parents 1a082c5 + 2ab8620
commit e580c1b
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/http/vibe/http/fileserver.d b/http/vibe/http/fileserver.d
@@ -307,11 +307,15 @@ private void sendFileImpl(scope HTTPServerRequest req, scope HTTPServerResponse
 		}
 	}
 
-	auto mimetype = getMimeTypeForFile(pathstr);
+	auto mimetype = res.headers.get("Content-Type", getMimeTypeForFile(pathstr));
+
 	// avoid double-compression
 	if ("Content-Encoding" in res.headers && isCompressedFormat(mimetype))
 		res.headers.remove("Content-Encoding");
-	res.headers["Content-Type"] = mimetype;
+
+	if (!("Content-Type" in res.headers))
+		res.headers["Content-Type"] = mimetype;
+
 	res.headers.addField("Accept-Ranges", "bytes");
 	ulong rangeStart = 0;
 	ulong rangeEnd = 0;