Fix bug

Author: lunny

modules/public/static.go

@@ -10,11 +10,12 @@ import (
 	"compress/gzip"
 	"io"
 	"io/ioutil"
-	"log"
 	"mime"
 	"net/http"
 	"path/filepath"
 	"time"
+
+	"code.gitea.io/gitea/modules/log"
 )
 
 // Static implements the macaron static handler for serving assets.
@@ -60,9 +61,9 @@ func AssetIsDir(name string) (bool, error) {
 func ServeContent(w http.ResponseWriter, req *http.Request, name string, modtime time.Time, content io.ReadSeeker) {
 	encodings := parseAcceptEncoding(req.Header.Get("Accept-Encoding"))
 	if encodings["gzip"] {
-		if rd, ok := f.(*vfsgen۰CompressedFile); ok {
+		if rd, ok := content.(*vfsgen۰CompressedFile); ok {
 			w.Header().Set("Content-Encoding", "gzip")
-			ctype := mime.TypeByExtension(filepath.Ext(fi.Name()))
+			ctype := mime.TypeByExtension(filepath.Ext(name))
 			if ctype == "" {
 				// read a chunk to decide between utf-8 text and binary
 				var buf [512]byte
@@ -71,16 +72,17 @@ func ServeContent(w http.ResponseWriter, req *http.Request, name string, modtime
 				ctype = http.DetectContentType(buf[:n])
 				_, err := rd.Seek(0, io.SeekStart) // rewind to output whole file
 				if err != nil {
-					log.Printf("rd.Seek error: %v\n", err)
-					return false
+					log.Error("rd.Seek error: %v", err)
+					http.Error(w, http.StatusText(500), 500)
+					return
 				}
 			}
 			w.Header().Set("Content-Type", ctype)
-			http.ServeContent(w, req, file, fi.ModTime(), rd)
-			return true
+			http.ServeContent(w, req, name, modtime, rd)
+			return
 		}
 	}
 
-	http.ServeContent(w, req, file, fi.ModTime(), f)
-	return true
+	http.ServeContent(w, req, name, modtime, content)
+	return
 }