From a6304285b6271633d5c881ebff4472f93fc19e33 Mon Sep 17 00:00:00 2001
From: j2rong4cn <36783515+j2rong4cn@users.noreply.github.com>
Date: Thu, 3 Apr 2025 20:35:52 +0800
Subject: [PATCH] fix: revert "refactor(net): pass request header" (#8269)

https://github.com/AlistGo/alist/pull/8031/commits/5be50e77d9ad8d67e343aa7e9380bcdd2506ae8f
---
 internal/net/serve.go   |  2 +-
 internal/stream/util.go | 12 ++----------
 server/common/proxy.go  |  4 ++--
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/internal/net/serve.go b/internal/net/serve.go
index 8b6b3d1d..63e1cb45 100644
--- a/internal/net/serve.go
+++ b/internal/net/serve.go
@@ -114,7 +114,7 @@ func ServeHTTP(w http.ResponseWriter, r *http.Request, name string, modTime time
 
 	// 使用请求的Context
 	// 不然从sendContent读不到数据，即使请求断开CopyBuffer也会一直堵塞
-	ctx := context.WithValue(r.Context(), "request_header", &r.Header)
+	ctx := context.WithValue(r.Context(), "request_header", r.Header)
 	switch {
 	case len(ranges) == 0:
 		reader, err := RangeReadCloser.RangeRead(ctx, http_range.Range{Length: -1})
diff --git a/internal/stream/util.go b/internal/stream/util.go
index b2c76754..01019482 100644
--- a/internal/stream/util.go
+++ b/internal/stream/util.go
@@ -19,11 +19,7 @@ func GetRangeReadCloserFromLink(size int64, link *model.Link) (model.RangeReadCl
 	}
 	rangeReaderFunc := func(ctx context.Context, r http_range.Range) (io.ReadCloser, error) {
 		if link.Concurrency != 0 || link.PartSize != 0 {
-			requestHeader := ctx.Value("request_header")
-			if requestHeader == nil {
-				requestHeader = &http.Header{}
-			}
-			header := net.ProcessHeader(*(requestHeader.(*http.Header)), link.Header)
+			header := net.ProcessHeader(nil, link.Header)
 			down := net.NewDownloader(func(d *net.Downloader) {
 				d.Concurrency = link.Concurrency
 				d.PartSize = link.PartSize
@@ -64,11 +60,7 @@ func GetRangeReadCloserFromLink(size int64, link *model.Link) (model.RangeReadCl
 }
 
 func RequestRangedHttp(ctx context.Context, link *model.Link, offset, length int64) (*http.Response, error) {
-	requestHeader := ctx.Value("request_header")
-	if requestHeader == nil {
-		requestHeader = &http.Header{}
-	}
-	header := net.ProcessHeader(*(requestHeader.(*http.Header)), link.Header)
+	header := net.ProcessHeader(nil, link.Header)
 	header = http_range.ApplyRangeToHttpHeader(http_range.Range{Start: offset, Length: length}, header)
 
 	return net.RequestHttp(ctx, "GET", header, link.URL)
diff --git a/server/common/proxy.go b/server/common/proxy.go
index c14af6fa..f9e1e4bb 100644
--- a/server/common/proxy.go
+++ b/server/common/proxy.go
@@ -50,9 +50,9 @@ func Proxy(w http.ResponseWriter, r *http.Request, link *model.Link, file model.
 		rangeReader := func(ctx context.Context, httpRange http_range.Range) (io.ReadCloser, error) {
 			requestHeader := ctx.Value("request_header")
 			if requestHeader == nil {
-				requestHeader = &http.Header{}
+				requestHeader = http.Header{}
 			}
-			header := net.ProcessHeader(*(requestHeader.(*http.Header)), link.Header)
+			header := net.ProcessHeader(requestHeader.(http.Header), link.Header)
 			down := net.NewDownloader(func(d *net.Downloader) {
 				d.Concurrency = link.Concurrency
 				d.PartSize = link.PartSize