diff options
| author | Chris Lu <chris.lu@gmail.com> | 2020-08-01 13:08:10 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2020-08-01 13:08:10 -0700 |
| commit | 2f03481cb288e1677a489caceaedd870b6960ed3 (patch) | |
| tree | 90cd78ed81aee020d11bff92462a4e84fbf5b2c2 /weed/util | |
| parent | e1f070a9a1699578de4f1513f62453c7a490514f (diff) | |
| download | seaweedfs-2f03481cb288e1677a489caceaedd870b6960ed3.tar.xz seaweedfs-2f03481cb288e1677a489caceaedd870b6960ed3.zip | |
in case when content is not compressed
Diffstat (limited to 'weed/util')
| -rw-r--r-- | weed/util/compression.go | 2 | ||||
| -rw-r--r-- | weed/util/http_util.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/weed/util/compression.go b/weed/util/compression.go index 4488e019e..2881a7bfd 100644 --- a/weed/util/compression.go +++ b/weed/util/compression.go @@ -39,7 +39,7 @@ func DecompressData(input []byte) ([]byte, error) { if IsZstdContent(input) { return unzstdData(input) } - return nil, fmt.Errorf("unsupported compression") + return input, fmt.Errorf("unsupported compression") } func ungzipData(input []byte) ([]byte, error) { diff --git a/weed/util/http_util.go b/weed/util/http_util.go index c67eb3276..b3c5a4033 100644 --- a/weed/util/http_util.go +++ b/weed/util/http_util.go @@ -312,7 +312,7 @@ func readEncryptedUrl(fileUrl string, cipherKey []byte, isContentCompressed bool if isContentCompressed { decryptedData, err = DecompressData(decryptedData) 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 { |