Browse Source

in case when content is not compressed

pull/1507/head
Chris Lu 4 years ago
parent
commit
2f03481cb2
  1. 2
      weed/util/compression.go
  2. 2
      weed/util/http_util.go

2
weed/util/compression.go

@ -39,7 +39,7 @@ func DecompressData(input []byte) ([]byte, error) {
if IsZstdContent(input) { if IsZstdContent(input) {
return unzstdData(input) return unzstdData(input)
} }
return nil, fmt.Errorf("unsupported compression")
return input, fmt.Errorf("unsupported compression")
} }
func ungzipData(input []byte) ([]byte, error) { func ungzipData(input []byte) ([]byte, error) {

2
weed/util/http_util.go

@ -312,7 +312,7 @@ func readEncryptedUrl(fileUrl string, cipherKey []byte, isContentCompressed bool
if isContentCompressed { if isContentCompressed {
decryptedData, err = DecompressData(decryptedData) decryptedData, err = DecompressData(decryptedData)
if err != nil { if err != nil {
return fmt.Errorf("unzip decrypt %s: %v", fileUrl, err)
glog.V(0).Info("unzip decrypt %s: %v", fileUrl, err)
} }
} }
if len(decryptedData) < int(offset)+size { if len(decryptedData) < int(offset)+size {

Loading…
Cancel
Save