aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lu <chris.lu@gmail.com>2012-10-23 10:59:40 -0700
committerChris Lu <chris.lu@gmail.com>2012-10-23 10:59:40 -0700
commit963082557600373230a32d0247fb29d746aface4 (patch)
treea02f57bb19a26ae5f9892bd850b4ba3243ebbc7e
parent6f7b0cafee1e7df2b43b3d5ebec6750954f332ef (diff)
downloadseaweedfs-963082557600373230a32d0247fb29d746aface4.tar.xz
seaweedfs-963082557600373230a32d0247fb29d746aface4.zip
adjusting gzip logic
-rw-r--r--weed-fs/src/cmd/weed/volume.go2
-rw-r--r--weed-fs/src/pkg/storage/compress.go6
-rw-r--r--weed-fs/src/pkg/storage/needle.go2
3 files changed, 5 insertions, 5 deletions
diff --git a/weed-fs/src/cmd/weed/volume.go b/weed-fs/src/cmd/weed/volume.go
index 9696ffc85..259dbfded 100644
--- a/weed-fs/src/cmd/weed/volume.go
+++ b/weed-fs/src/cmd/weed/volume.go
@@ -105,7 +105,7 @@ func GetHandler(w http.ResponseWriter, r *http.Request) {
if ext != "" {
mtype := mime.TypeByExtension(ext)
w.Header().Set("Content-Type", mtype)
- if storage.IsCompressable(ext, mtype) {
+ if storage.IsGzippable(ext, mtype) {
if strings.Contains(r.Header.Get("Accept-Encoding"), "gzip") {
w.Header().Set("Content-Encoding", "gzip")
} else {
diff --git a/weed-fs/src/pkg/storage/compress.go b/weed-fs/src/pkg/storage/compress.go
index d441db009..2de547869 100644
--- a/weed-fs/src/pkg/storage/compress.go
+++ b/weed-fs/src/pkg/storage/compress.go
@@ -8,12 +8,12 @@ import (
"strings"
)
-func IsCompressable(ext, mtype string) bool {
+func IsGzippable(ext, mtype string) bool {
if ext == ".zip" {
- return true
+ return false
}
if ext == ".rar" {
- return true
+ return false
}
if strings.Index(mtype,"text/")==0 {
return true
diff --git a/weed-fs/src/pkg/storage/needle.go b/weed-fs/src/pkg/storage/needle.go
index 8f3a26ee6..e352eb55d 100644
--- a/weed-fs/src/pkg/storage/needle.go
+++ b/weed-fs/src/pkg/storage/needle.go
@@ -40,7 +40,7 @@ func NewNeedle(r *http.Request) (n *Needle, fname string, e error) {
if dotIndex > 0 {
ext := fname[dotIndex:]
mtype := mime.TypeByExtension(ext)
- if IsCompressable(ext, mtype) {
+ if IsGzippable(ext, mtype) {
data = GzipData(data)
}
}