Use QueryString while constructing RequestURI instead of QueryArgs if…

… parsedQueryArgs is set to false (valyala#937)
misinfo163 · Jan 2, 2021 · 6234776 · 6234776
1 parent 245e7ec
commit 6234776
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/uri.go b/uri.go
@@ -406,7 +406,7 @@ func (u *URI) RequestURI() []byte {
 	} else {
 		dst = appendQuotedPath(u.requestURI[:0], u.Path())
 	}
-	if u.queryArgs.Len() > 0 {
+	if u.parsedQueryArgs && u.queryArgs.Len() > 0 {
 		dst = append(dst, '?')
 		dst = u.queryArgs.AppendBytes(dst)
 	} else if len(u.queryString) > 0 {

diff --git a/uri_test.go b/uri_test.go
@@ -386,3 +386,15 @@ func testURIParse(t *testing.T, u *URI, host, uri,
 		t.Fatalf("Unexpected hash %q. Expected %q. host=%q, uri=%q", u.Hash(), expectedHash, host, uri)
 	}
 }
+
+func TestURIWithQuerystringOverride(t *testing.T) {
+	var u URI
+	u.SetQueryString("q1=foo&q2=bar")
+	u.QueryArgs().Add("q3", "baz")
+	u.SetQueryString("q1=foo&q2=bar&q4=quux")
+	uriString := string(u.RequestURI())
+
+	if uriString != "/?q1=foo&q2=bar&q4=quux" {
+		t.Fatalf("Expected Querystring to be overriden but was %s ", uriString)
+	}
+}