From d89f410749c9b8e13ca2878d10506e25ab19234f Mon Sep 17 00:00:00 2001
From: Redkale <22250530@qq.com>
Date: Wed, 8 Mar 2017 17:22:56 +0800
Subject: [PATCH]

---
 src/org/redkale/net/http/HttpResponse.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/redkale/net/http/HttpResponse.java b/src/org/redkale/net/http/HttpResponse.java
index 7ba7b715c..be444075c 100644
--- a/src/org/redkale/net/http/HttpResponse.java
+++ b/src/org/redkale/net/http/HttpResponse.java
@@ -535,7 +535,7 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
         if (filename != null && !filename.isEmpty() && file != null) {
             addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(filename, "UTF-8"));
         }
-        this.contentType = MimeType.getByFilename(filename == null || filename.isEmpty() ? file.getName() : filename);
+        if (this.contentType == null) this.contentType = MimeType.getByFilename(filename == null || filename.isEmpty() ? file.getName() : filename);
         if (this.contentType == null) this.contentType = "application/octet-stream";
         String range = request.getHeader("Range");
         if (range != null && (!range.startsWith("bytes=") || range.indexOf(',') >= 0)) range = null;