diff --git a/client/daemon/objectstorage/objectstorage.go b/client/daemon/objectstorage/objectstorage.go index 8fcb6c7e3df..27a0b048727 100644 --- a/client/daemon/objectstorage/objectstorage.go +++ b/client/daemon/objectstorage/objectstorage.go @@ -289,7 +289,7 @@ func (o *objectStorage) getObject(ctx *gin.Context) { rg = &rangeValue // Range header in dragonfly is without "bytes=". - urlMeta.Range = strings.TrimLeft(rangeHeader, "bytes=") + urlMeta.Range = strings.TrimPrefix(rangeHeader, "bytes=") // When the request has a range header, // there is no need to calculate md5, set this value to empty. diff --git a/client/daemon/peer/peertask_manager_test.go b/client/daemon/peer/peertask_manager_test.go index 9a5ff72c775..783f4419c28 100644 --- a/client/daemon/peer/peertask_manager_test.go +++ b/client/daemon/peer/peertask_manager_test.go @@ -630,7 +630,7 @@ func TestPeerTaskManager_TaskSuite(t *testing.T) { } if tc.httpRange != nil { - urlMeta.Range = strings.TrimLeft(tc.httpRange.String(), "bytes=") + urlMeta.Range = strings.TrimPrefix(tc.httpRange.String(), "bytes=") } if tc.urlGenerator != nil { diff --git a/client/daemon/transport/transport.go b/client/daemon/transport/transport.go index bd423387314..08294194145 100644 --- a/client/daemon/transport/transport.go +++ b/client/daemon/transport/transport.go @@ -261,7 +261,7 @@ func (rt *transport) download(ctx context.Context, req *http.Request) (*http.Res } rg = &rgs[0] // range in dragonfly is without "bytes=" - meta.Range = strings.TrimLeft(rangeHeader, "bytes=") + meta.Range = strings.TrimPrefix(rangeHeader, "bytes=") } // Pick header's parameters diff --git a/client/dfget/dfget.go b/client/dfget/dfget.go index 66d3a7b9625..0902e38cc9c 100644 --- a/client/dfget/dfget.go +++ b/client/dfget/dfget.go @@ -234,7 +234,7 @@ func parseHeader(s []string) map[string]string { func newDownRequest(cfg *config.DfgetConfig, hdr map[string]string) *dfdaemonv1.DownRequest { var rg string if r, ok := hdr[headers.Range]; ok { - rg = strings.TrimLeft(r, "bytes=") + rg = strings.TrimPrefix(r, "bytes=") } else { rg = cfg.Range } diff --git a/scheduler/job/job.go b/scheduler/job/job.go index 834db3675c3..04bc14df782 100644 --- a/scheduler/job/job.go +++ b/scheduler/job/job.go @@ -172,7 +172,7 @@ func (j *job) preheat(ctx context.Context, req string) error { if preheat.Headers != nil { if r, ok := preheat.Headers[headers.Range]; ok { // Range in dragonfly is without "bytes=". - urlMeta.Range = strings.TrimLeft(r, http.RangePrefix) + urlMeta.Range = strings.TrimPrefix(r, http.RangePrefix) } }