From 9995168f9ad6fe3b2b9e1b034b5b48ae9c677ea1 Mon Sep 17 00:00:00 2001
From: Francois <francoishill11@gmail.com>
Date: Sat, 14 Dec 2013 20:35:57 +0200
Subject: [PATCH] Update router.go

---
 router.go | 45 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/router.go b/router.go
index 018bb0ad..b40e1511 100644
--- a/router.go
+++ b/router.go
@@ -473,7 +473,39 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request)
 				middleware.Exception("403", rw, r, "403 Forbidden")
 				goto Admin
 			}
-			http.ServeFile(w, r, file)
+			
+			//This block obtained from (https://github.com/smithfox/beego) - it should probably get merged into astaxie/beego after a pull request
+			isStaticFileToCompress := false
+			if StaticExtensionsToGzip != nil && len(StaticExtensionsToGzip) > 0 {
+				for _, statExtension := range StaticExtensionsToGzip {
+					if strings.HasSuffix(strings.ToLower(file), strings.ToLower(statExtension)) {
+						isStaticFileToCompress = true
+						break
+					}
+				}
+			}
+
+			if isStaticFileToCompress {
+				if EnableGzip {
+					w.contentEncoding = GetAcceptEncodingZip(r)
+				}
+
+				memzipfile, err := OpenMemZipFile(file, w.contentEncoding)
+				if err != nil {
+					return
+				}
+
+				w.InitHeadContent(finfo.Size())
+
+				if strings.HasSuffix(file, ".mustache") {
+					w.Header().Set("Content-Type", "text/html; charset=utf-8") //FIXME: hardcode
+				}
+
+				http.ServeContent(w, r, file, finfo.ModTime(), memzipfile)
+			} else {
+				http.ServeFile(w, r, file)
+			}
+			
 			w.started = true
 			goto Admin
 		}
@@ -901,6 +933,7 @@ type responseWriter struct {
 	writer  http.ResponseWriter
 	started bool
 	status  int
+	contentEncoding string
 }
 
 // Header returns the header map that will be sent by WriteHeader.
@@ -908,6 +941,16 @@ func (w *responseWriter) Header() http.Header {
 	return w.writer.Header()
 }
 
+func (w *responseWriter) InitHeadContent(contentlength int64) {
+	if w.contentEncoding == "gzip" {
+		w.Header().Set("Content-Encoding", "gzip")
+	} else if w.contentEncoding == "deflate" {
+		w.Header().Set("Content-Encoding", "deflate")
+	} else {
+		w.Header().Set("Content-Length", strconv.FormatInt(contentlength, 10))
+	}
+}
+
 // Write writes the data to the connection as part of an HTTP reply,
 // and sets `started` to true
 func (w *responseWriter) Write(p []byte) (int, error) {