make sure beforeRequests executed before client middleware(fix #248)

imroc · Jun 28, 2023 · d9fef28 · d9fef28
1 parent 45ace4b
commit d9fef28
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/client.go b/client.go
@@ -1516,21 +1516,6 @@ func (c *Client) roundTrip(r *Request) (resp *Response, err error) {
 		}
 	}()
 
-	if r.Headers == nil {
-		r.Headers = make(http.Header)
-	}
-
-	for _, f := range r.client.udBeforeRequest {
-		if err = f(r.client, r); err != nil {
-			return
-		}
-	}
-	for _, f := range r.client.beforeRequest {
-		if err = f(r.client, r); err != nil {
-			return
-		}
-	}
-
 	// setup trace
 	if r.trace == nil && r.client.trace {
 		r.trace = &clientTrace{}

diff --git a/request.go b/request.go
@@ -587,6 +587,20 @@ func (r *Request) do() (resp *Response, err error) {
 	}()
 
 	for {
+		if r.Headers == nil {
+			r.Headers = make(http.Header)
+		}
+		for _, f := range r.client.udBeforeRequest {
+			if err = f(r.client, r); err != nil {
+				return
+			}
+		}
+		for _, f := range r.client.beforeRequest {
+			if err = f(r.client, r); err != nil {
+				return
+			}
+		}
+
 		if r.client.wrappedRoundTrip != nil {
 			resp, err = r.client.wrappedRoundTrip.RoundTrip(r)
 		} else {