version to 7.25.3

Author: YangSen-qn

CHANGELOG.md

@@ -1,4 +1,9 @@
 # Changelog
+## 7.25.3
+
+* 修复
+  * 分片上传请求头增加 Content-Length
+
 
 ## 7.25.2
 

README.md

@@ -17,7 +17,7 @@ github.com/qiniu/go-sdk
 在您的项目中的 `go.mod` 文件内添加这行代码
 
 ```
-require github.com/qiniu/go-sdk/v7 v7.25.2
+require github.com/qiniu/go-sdk/v7 v7.25.3
 ```
 
 并且在项目中使用 `"github.com/qiniu/go-sdk/v7"` 引用 Qiniu Go SDK。

conf/conf.go

@@ -4,7 +4,7 @@ import (
 	"github.com/qiniu/go-sdk/v7/internal/env"
 )
 
-const Version = "7.25.1"
+const Version = "7.25.3"
 
 const (
 	CONTENT_TYPE_JSON      = "application/json"

internal/clientv2/request.go

@@ -100,7 +100,7 @@ func NewRequest(options RequestParams) (req *http.Request, err error) {
 		if contentLengthHeaderValue := options.Header.Get("Content-Length"); contentLengthHeaderValue != "" {
 			contentLength, err = strconv.ParseInt(contentLengthHeaderValue, 10, 64)
 			if err != nil {
-				return nil, fmt.Errorf("invalid Content-Length header value: %s, %w", contentLengthHeaderValue, err)
+				return nil, fmt.Errorf("invalid Content-Length header value: %s, %s", contentLengthHeaderValue, err)
 			}
 		}
 		if options.OnRequestProgress != nil {

types.go

@@ -2,6 +2,7 @@ package api
 
 import (
 	"bytes"
+	"fmt"
 	"io"
 	"net/http"
 
@@ -13,7 +14,14 @@ func BytesFromRequest(r *http.Request) ([]byte, error) {
 	if bytesNopCloser, ok := r.Body.(*internal_io.BytesNopCloser); ok {
 		return bytesNopCloser.Bytes(), nil
 	}
-	buf := bytes.NewBuffer(make([]byte, 0, int(r.ContentLength)+1024))
+
+	// 不能大于10G
+	if r.ContentLength > 1024*1024*1024*10 {
+		return nil, fmt.Errorf("content length too large:%d", r.ContentLength)
+	}
+
+	contentLength := int(r.ContentLength) + 1024
+	buf := bytes.NewBuffer(make([]byte, 0, contentLength))
 	_, err := io.Copy(buf, r.Body)
 	if err != nil {
 		return nil, err