fix: correctly skip cookies

whitewater-guide · Aug 3, 2020 · 10aa148 · 10aa148
1 parent 83b629d
commit 10aa148
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/core/client.go b/core/client.go
@@ -128,7 +128,8 @@ func (client *HTTPClient) Do(req *http.Request, opts *RequestOptions) (*http.Res
 	if opts != nil && resp != nil && opts.SkipCookies {
 		cookies := resp.Cookies()
 		for _, rc := range cookies {
-			client.PersistentJar.RemoveCookie(rc)
+			rc.MaxAge = -1
+			client.Jar.SetCookies(resp.Request.URL, []*http.Cookie{rc})
 		}
 	}
 

diff --git a/scripts/quebec/readings.go b/scripts/quebec/readings.go
@@ -92,8 +92,9 @@ func (s *scriptQuebec) getReadings(recv chan<- *core.Measurement, errs chan<- er
 		errs <- err
 		return
 	}
-	// resp, err := core.Client.Get(fmt.Sprintf(s.readingsURLFormat, code), &core.RequestOptions{SkipCookies: true})
-	resp, err := core.Client.Get(fmt.Sprintf(s.readingsURLFormat, code), nil)
+	// will set-cookies every time, until max headers length overflows
+	// the workaround is to ignore cookies entirely
+	resp, err := core.Client.Get(fmt.Sprintf(s.readingsURLFormat, code), &core.RequestOptions{SkipCookies: true})
 	if err != nil {
 		errs <- err
 		return