From 8c69fb189ad7aa7b5852b783a3110abe7d92352e Mon Sep 17 00:00:00 2001
From: fengfei <fengfei08@gmail.com>
Date: Wed, 19 Apr 2017 01:31:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9D=99=E6=80=81=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=BE=93=E5=87=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/config/web/HttpRequestHandler.java | 20 +++++++++++++------
 .../lanproxy/server/config/web/MimeType.java  |  7 ++++---
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/proxy-server/src/main/java/org/fengfei/lanproxy/server/config/web/HttpRequestHandler.java b/proxy-server/src/main/java/org/fengfei/lanproxy/server/config/web/HttpRequestHandler.java
index d80fa2b..a3af74a 100644
--- a/proxy-server/src/main/java/org/fengfei/lanproxy/server/config/web/HttpRequestHandler.java
+++ b/proxy-server/src/main/java/org/fengfei/lanproxy/server/config/web/HttpRequestHandler.java
@@ -90,12 +90,22 @@ public class HttpRequestHandler extends SimpleChannelInboundHandler<FullHttpRequ
         }
 
         String mimeType = MimeType.getMimeType(MimeType.parseSuffix(path));
-        RandomAccessFile file = new RandomAccessFile(rfile, "r");
+        long length = 0;
+        RandomAccessFile raf = null;
+        try {
+            raf = new RandomAccessFile(rfile, "r");
+            length = raf.length();
+        } finally {
+            if (length < 0 && raf != null) {
+                raf.close();
+            }
+        }
+
         HttpResponse response = new DefaultHttpResponse(request.getProtocolVersion(), status);
         response.headers().set(HttpHeaders.Names.CONTENT_TYPE, mimeType);
         boolean keepAlive = HttpHeaders.isKeepAlive(request);
         if (keepAlive) {
-            response.headers().set(HttpHeaders.Names.CONTENT_LENGTH, file.length());
+            response.headers().set(HttpHeaders.Names.CONTENT_LENGTH, length);
             response.headers().set(HttpHeaders.Names.CONNECTION, HttpHeaders.Values.KEEP_ALIVE);
         }
 
@@ -103,17 +113,15 @@ public class HttpRequestHandler extends SimpleChannelInboundHandler<FullHttpRequ
         ctx.write(response);
 
         if (ctx.pipeline().get(SslHandler.class) == null) {
-            ctx.write(new DefaultFileRegion(file.getChannel(), 0, file.length()));
+            ctx.write(new DefaultFileRegion(raf.getChannel(), 0, length));
         } else {
-            ctx.write(new ChunkedNioFile(file.getChannel()));
+            ctx.write(new ChunkedNioFile(raf.getChannel()));
         }
 
         ChannelFuture future = ctx.writeAndFlush(LastHttpContent.EMPTY_LAST_CONTENT);
         if (!keepAlive) {
             future.addListener(ChannelFutureListener.CLOSE);
         }
-        file.close();
-
     }
 
     private static void send100Continue(ChannelHandlerContext ctx) {
diff --git a/proxy-server/src/main/java/org/fengfei/lanproxy/server/config/web/MimeType.java b/proxy-server/src/main/java/org/fengfei/lanproxy/server/config/web/MimeType.java
index a29842e..589edb8 100644
--- a/proxy-server/src/main/java/org/fengfei/lanproxy/server/config/web/MimeType.java
+++ b/proxy-server/src/main/java/org/fengfei/lanproxy/server/config/web/MimeType.java
@@ -217,11 +217,12 @@ public class MimeType {
             String endUrl = spUrl[len - 1];
             if (matcher.find()) {
                 String[] spEndUrl = endUrl.split("\\?");
-                return spEndUrl[0].split("\\.")[1];
+                endUrl = spEndUrl[0];
             }
-            return endUrl.split("\\.")[1];
+            String[] endUrlArr = endUrl.split("\\.");
+            return endUrlArr[endUrlArr.length - 1];
         } catch (Exception e) {
-            return "html";
+            return "";
         }
     }
 }