2 files changed, 80 insertions, 1 deletions
diff --git a/MediaBrowser.Common/Net/Handlers/BaseEmbeddedResourceHandler.cs b/MediaBrowser.Common/Net/Handlers/BaseEmbeddedResourceHandler.cs
new file mode 100644
index 000000000..e64773f33
--- /dev/null
+++ b/MediaBrowser.Common/Net/Handlers/BaseEmbeddedResourceHandler.cs
@@ -0,0 +1,70 @@
+using System.IO;
+using System.IO.Compression;
+using System;
+
+namespace MediaBrowser.Common.Net.Handlers
+{
+    public abstract class BaseEmbeddedResourceHandler : Response
+    {
+        public BaseEmbeddedResourceHandler(RequestContext ctx, string resourcePath)
+            : base(ctx)
+        {
+            ResourcePath = resourcePath;
+
+            Headers["Content-Encoding"] = "gzip";
+
+            WriteStream = s =>
+            {
+                WriteReponse(s);
+                s.Close();
+            };
+        }
+
+        protected string ResourcePath { get; set; }
+
+        public override string ContentType
+        {
+            get
+            {
+                string extension = Path.GetExtension(ResourcePath);
+
+                if (extension.EndsWith("jpeg", StringComparison.OrdinalIgnoreCase) || extension.EndsWith("jpg", StringComparison.OrdinalIgnoreCase))
+                {
+                    return "image/jpeg";
+                }
+                else if (extension.EndsWith("png", StringComparison.OrdinalIgnoreCase))
+                {
+                    return "image/png";
+                }
+                else if (extension.EndsWith("ico", StringComparison.OrdinalIgnoreCase))
+                {
+                    return "image/ico";
+                }
+                else if (extension.EndsWith("js", StringComparison.OrdinalIgnoreCase))
+                {
+                    return "application/x-javascript";
+                }
+                else if (extension.EndsWith("css", StringComparison.OrdinalIgnoreCase))
+                {
+                    return "text/css";
+                }
+                else if (extension.EndsWith("html", StringComparison.OrdinalIgnoreCase))
+                {
+                    return "text/html; charset=utf-8";
+                }
+
+                return "text/plain; charset=utf-8";
+            }
+        }
+
+        private void WriteReponse(Stream stream)
+        {
+            using (GZipStream gzipStream = new GZipStream(stream, CompressionMode.Compress, false))
+            {
+                GetEmbeddedResourceStream().CopyTo(gzipStream);
+            }
+        }
+
+        protected abstract Stream GetEmbeddedResourceStream();
+    }
+}
diff --git a/MediaBrowser.Common/Net/RequestContext.cs b/MediaBrowser.Common/Net/RequestContext.cs
index 9a21b473d..d3635f34a 100644
--- a/MediaBrowser.Common/Net/RequestContext.cs
+++ b/MediaBrowser.Common/Net/RequestContext.cs
@@ -9,6 +9,14 @@ namespace MediaBrowser.Common.Net
         public HttpListenerRequest Request { get; private set; }
         public HttpListenerResponse Response { get; private set; }
 
+        public string LocalPath
+        {
+            get
+            {
+                return Request.Url.LocalPath;
+            }
+        }
+
         public RequestContext(HttpListenerContext context)
         {
             Response = context.Response;
@@ -19,6 +27,8 @@ namespace MediaBrowser.Common.Net
         {
             Response.AddHeader("Access-Control-Allow-Origin", "*");
 
+            Response.KeepAlive = true;
+            
             foreach (var header in handler.Headers)
             {
                 Response.AddHeader(header.Key, header.Value);
@@ -52,7 +62,6 @@ namespace MediaBrowser.Common.Net
                 {
                     CacheResponse(Response, cacheDuration, handler.LastDateModified);
                 }
-
                 handler.WriteStream(Response.OutputStream);
             }
             else