Skip to content

Commit

Permalink
detect more gzippable content
Browse files Browse the repository at this point in the history
  • Loading branch information
chrislusf committed Dec 22, 2018
1 parent 49f40cd commit c043fd1
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 3 deletions.
27 changes: 25 additions & 2 deletions weed/operation/compress.go
Expand Up @@ -8,21 +8,41 @@ import (
"strings"

"github.com/chrislusf/seaweedfs/weed/glog"
"golang.org/x/tools/godoc/util"
)

/*
* Default more not to gzip since gzip can be done on client side.
*/
func IsGzippable(ext, mtype string) bool {
func IsGzippable(ext, mtype string, data []byte) bool {

// text
if strings.HasPrefix(mtype, "text/") {
return true
}

// images
switch ext {
case ".svg", ".bmp":
return true
}
if strings.HasPrefix(mtype, "image/") {
return false
}

// by file name extention
switch ext {
case ".zip", ".rar", ".gz", ".bz2", ".xz":
return false
case ".pdf", ".txt", ".html", ".htm", ".css", ".js", ".json":
return true
case ".php", ".java", ".go", ".rb", ".c", ".cpp", ".h", ".hpp":
return true
case ".png", ".jpg", ".jpeg", "":
return true
}

// by mime type
if strings.HasPrefix(mtype, "application/") {
if strings.HasSuffix(mtype, "xml") {
return true
Expand All @@ -31,7 +51,10 @@ func IsGzippable(ext, mtype string) bool {
return true
}
}
return false

isMostlyText := util.IsText(data)

return isMostlyText
}

func GzipData(input []byte) ([]byte, error) {
Expand Down
2 changes: 1 addition & 1 deletion weed/storage/needle_parse_multipart.go
Expand Up @@ -87,7 +87,7 @@ func parseMultipart(r *http.Request) (
originalDataSize = len(unzipped)
}
isGzipped = true
} else if operation.IsGzippable(ext, mtype) {
} else if operation.IsGzippable(ext, mtype, data) {
if data, e = operation.GzipData(data); e != nil {
return
}
Expand Down

0 comments on commit c043fd1

Please sign in to comment.