Revert "add error return for (Un)GzipData"

This reverts commit 8243710351.
This commit is contained in:
Chris Lu 2013-01-17 00:15:09 -08:00
parent bf9c4ed033
commit a502b78c3f
3 changed files with 35 additions and 25 deletions

View file

@ -156,9 +156,7 @@ func GetHandler(w http.ResponseWriter, r *http.Request) {
if strings.Contains(r.Header.Get("Accept-Encoding"), "gzip") {
w.Header().Set("Content-Encoding", "gzip")
} else {
if n.Data, err = storage.UnGzipData(n.Data); err != nil {
debug("lookup error:", err, r.URL.Path)
}
n.Data = storage.UnGzipData(n.Data)
}
}
}

View file

@ -15,35 +15,49 @@ func IsGzippable(ext, mtype string) bool {
if strings.HasPrefix(mtype, "text/"){
return true
}
switch ext {
case ".zip", ".rar", ".gz", ".bz2", ".xz":
if ext == ".zip" {
return false
case ".pdf", ".txt", ".html", ".css", ".js", ".json":
}
if ext == ".rar" {
return false
}
if ext == ".gz" {
return false
}
if ext == ".pdf" {
return true
}
if ext == ".css" {
return true
}
if ext == ".js" {
return true
}
if ext == ".json" {
return true
}
if strings.HasPrefix(mtype, "application/") {
if strings.HasSuffix(mtype, "xml") ||
strings.HasSuffix(mtype, "script") {
if strings.HasSuffix(mtype, "xml") {
return true
}
if strings.HasSuffix(mtype, "script") {
return true
}
}
return false
}
func GzipData(input []byte) ([]byte, error) {
func GzipData(input []byte) []byte {
buf := new(bytes.Buffer)
w, _ := gzip.NewWriterLevel(buf, flate.BestCompression)
if _, err := w.Write(input); err != nil {
println("error compressing data:", err)
return nil, err
}
if err := w.Close(); err != nil {
println("error closing compressed data:", err)
return nil, err
}
return buf.Bytes(), nil
return buf.Bytes()
}
func UnGzipData(input []byte) ([]byte, error) {
func UnGzipData(input []byte) []byte {
buf := bytes.NewBuffer(input)
r, _ := gzip.NewReader(buf)
defer r.Close()
@ -51,5 +65,5 @@ func UnGzipData(input []byte) ([]byte, error) {
if err != nil {
println("error uncompressing data:", err)
}
return output, err
return output
}

View file

@ -64,9 +64,7 @@ func NewNeedle(r *http.Request) (n *Needle, fname string, e error) {
mtype = contentType
}
if IsGzippable(ext, mtype) {
if data, e = GzipData(data); e != nil {
return
}
data = GzipData(data)
n.SetGzipped()
}
if ext == ".gz" {