diff options
| author | Konstantin Lebedev <lebedev_k@tochka.com> | 2021-03-16 15:29:49 +0500 |
|---|---|---|
| committer | Konstantin Lebedev <lebedev_k@tochka.com> | 2021-03-16 15:29:49 +0500 |
| commit | eb54993a4eacffde48007bb3bcc46b664d38c403 (patch) | |
| tree | 1ef3f4cd86f9772631496a193bdeb62e25e780de /weed/util/http_util.go | |
| parent | 06da02739d4a97dd8288f7fa05de7cd369e97d78 (diff) | |
| parent | 9672f9e1b2ed399470e6ec877a667417c8b26870 (diff) | |
| download | seaweedfs-eb54993a4eacffde48007bb3bcc46b664d38c403.tar.xz seaweedfs-eb54993a4eacffde48007bb3bcc46b664d38c403.zip | |
Merge branch 'upstreamMaster' into check_chunkviews_mr
# Conflicts:
# weed/filer/filechunk_manifest.go
# weed/filer/stream.go
# weed/replication/repl_util/replication_util.go
# weed/util/fasthttp_util.go
Diffstat (limited to 'weed/util/http_util.go')
| -rw-r--r-- | weed/util/http_util.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/weed/util/http_util.go b/weed/util/http_util.go index eff282bab..135d10c45 100644 --- a/weed/util/http_util.go +++ b/weed/util/http_util.go @@ -313,7 +313,7 @@ func ReadUrlAsStream(fileUrl string, cipherKey []byte, isContentGzipped bool, is } func readEncryptedUrl(fileUrl string, cipherKey []byte, isContentCompressed bool, isFullChunk bool, offset int64, size int, fn func(data []byte)) (bool, error) { - encryptedData, retryable, err := FastGet(fileUrl) + encryptedData, retryable, err := Get(fileUrl) if err != nil { return retryable, fmt.Errorf("fetch %s: %v", fileUrl, err) } |