8000 fix: revert "refactor(net): pass request header" (#8269) · AlistGo/alist@a630428 · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Commit a630428

Browse files
authored
fix: revert "refactor(net): pass request header" (#8269)
5be50e7
1 parent affd0ce commit a630428

File tree

3 files changed

+5
-13
lines changed

3 files changed

+5
-13
lines changed

internal/net/serve.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ func ServeHTTP(w http.ResponseWriter, r *http.Request, name string, modTime time
114114

115115
// 使用请求的Context
116116
// 不然从sendContent读不到数据,即使请求断开CopyBuffer也会一直堵塞
117-
ctx := context.WithValue(r.Context(), "request_header", &r.Header)
117+
ctx := context.WithValue(r.Context(), "request_header", r.Header)
118118
switch {
119119
case len(ranges) == 0:
120120
reader, err := RangeReadCloser.RangeRead(ctx, http_range.Range{Length: -1})

internal/stream/util.go

+2-10
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,7 @@ func GetRangeReadCloserFromLink(size int64, link *model.Link) (model.RangeReadCl
1919
}
2020
rangeReaderFunc := func(ctx context.Context, r http_range.Range) (io.ReadCloser, error) {
2121
if link.Concurrency != 0 || link.PartSize != 0 {
22-
requestHeader := ctx.Value("request_header")
23-
if requestHeader == nil {
24-
requestHeader = &http.Header{}
25-
}
26-
header := net.ProcessHeader(*(requestHeader.(*http.Header)), link.Header)
22+
header := net.ProcessHeader(nil, link.Header)
2723
down := net.NewDownloader(func(d *net.Downloader) {
2824
d.Concurrency = link.Concurrency
2925
d.PartSize = link.PartSize
@@ -64,11 +60,7 @@ func GetRangeReadCloserFromLink(size int64, link *model.Link) (model.RangeReadCl
6460
}
6561

6662
func RequestRangedHttp(ctx context.Context, link *model.Link, offset, length int64) (*http.Response, error) {
67-
requestHeader := ctx.Value("request_header")
68-
if requestHeader == nil {
69-
requestHeader = &http.Header{}
70-
}
71-
header := net.ProcessHeader(*(requestHeader.(*http.Header)), link.Header)
63+
header := net.ProcessHeader(nil, link.Header)
7264
header = http_range.ApplyRangeToHttpHeader(http_range.Range{Start: offset, Length: length}, header)
7365

7466
return net.RequestHttp(ctx, "GET", header, link.URL)

server/common/proxy.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ func Proxy(w http.ResponseWriter, r *http.Request, link *model.Link, file model.
5050
rangeReader := func(ctx context.Context, httpRange http_range.Range) (io.ReadCloser, error) {
5151
requestHeader := ctx.Value("request_header")
5252
if requestHeader == nil {
53-
requestHeader = &http.Header{}
53+
requestHeader = http.Header{}
5454
}
55-
header := net.ProcessHeader(*(requestHeader.(*http.Header)), link.Header)
55+
header := net.ProcessHeader(requestHeader.(http.Header), link.Header)
5656
down := net.NewDownloader(func(d *net.Downloader) {
5757
d.Concurrency = link.Concurrency
5858
d.PartSize = link.PartSize

0 commit comments

Comments
 (0)
0