TRKJ/EdgeNode
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeNode.git synced 2025-11-04 07:40:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复修改后的Partial Content Range范围多1字节的问题

Browse Source
This commit is contained in:
GoEdgeLab
2024-05-07 16:32:53 +08:00
parent 83bc50c3d1
commit e5f1f42259
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
internal/nodes/http_request_cache.go
View File

@@ -530,6 +530,7 @@ func (this *HTTPRequest) doCacheRead(useStale bool) (shouldStop bool) {
if firstRangeEnd > 0 { if firstRangeEnd > 0 {
rangeEnd = firstRangeEnd rangeEnd = firstRangeEnd
} }
err = reader.ReadBodyRange(bodyBuf.Bytes, ranges[0].Start(), rangeEnd, func(n int) (goNext bool, readErr error) { err = reader.ReadBodyRange(bodyBuf.Bytes, ranges[0].Start(), rangeEnd, func(n int) (goNext bool, readErr error) {
_, readErr = this.writer.Write(bodyBuf.Bytes[:n]) _, readErr = this.writer.Write(bodyBuf.Bytes[:n])
if readErr != nil { if readErr != nil {
@@ -725,7 +726,7 @@ func (this *HTTPRequest) tryPartialReader(storage caches.StorageInterface, key s
r2, findOk := partialReader.Ranges().FindRangeAtPosition(r.Start()) r2, findOk := partialReader.Ranges().FindRangeAtPosition(r.Start())
if findOk && r2.Length() >= (256<<10) /* worth reading */ { if findOk && r2.Length() >= (256<<10) /* worth reading */ {
isOk = true isOk = true
ranges[0] = [2]int64{r.Start(), partialReader.BodySize()} // Content-Range: bytes 0-[CONTENT_LENGTH - 1]/CONTENT_LENGTH ranges[0] = [2]int64{r.Start(), partialReader.BodySize() - 1} // Content-Range: bytes 0-[CONTENT_LENGTH - 1]/CONTENT_LENGTH
pReader.SetNextReader(NewHTTPRequestPartialReader(this, r2.End(), partialReader)) pReader.SetNextReader(NewHTTPRequestPartialReader(this, r2.End(), partialReader))
return pReader, ranges, r2.End() - 1 /* not include last byte */, true return pReader, ranges, r2.End() - 1 /* not include last byte */, true