api: use http request Clone (micro#1458)

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
ylsGit · Mar 31, 2020 · 7b7a859 · 7b7a859
1 parent 8a8742f
commit 7b7a859
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/api/handler/rpc/rpc.go b/api/handler/rpc/rpc.go
@@ -128,7 +128,7 @@ func (h *rpcHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	cx = metadata.MergeContext(cx, md, true)
 
 	// set merged context to request
-	*r = *r.WithContext(cx)
+	*r = *r.Clone(cx)
 
 	// if stream we currently only support json
 	if isStream(r, service) {
@@ -324,7 +324,7 @@ func requestPayload(r *http.Request) ([]byte, error) {
 	}
 
 	// restore context without fields
-	*r = *r.WithContext(metadata.NewContext(ctx, md))
+	*r = *r.Clone(metadata.NewContext(ctx, md))
 
 	for k, v := range matches {
 		ps := strings.Split(k, ".")

diff --git a/api/router/static/static.go b/api/router/static/static.go
@@ -262,7 +262,7 @@ func (r *staticRouter) endpoint(req *http.Request) (*endpoint, error) {
 			for k, v := range matches {
 				md[fmt.Sprintf("x-api-field-%s", k)] = v
 			}
-			*req = *req.WithContext(context.WithValue(ctx, metadata.MetadataKey{}, md))
+			*req = *req.Clone(context.WithValue(ctx, metadata.MetadataKey{}, md))
 			break pathLoop
 		}
 		if !pMatch {