c/ooni-probe-cli
Watch
1
0
Fork
You've already forked ooni-probe-cli
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(oohelperd): reduce differences with legacy helper (#504)

Browse source 
Part of https://github.com/ooni/probe/issues/1707
This commit is contained in:
Simone Basso 2021-09-27 08:13:30 +02:00 • committed by GitHub
commit 985c1ba761
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
internal/cmd/oohelperd/internal/webconnectivity/http.go
View file

@ -30,7 +30,11 @@ func HTTPDo(ctx context.Context, config *HTTPConfig) {
defer config.Wg.Done()
req, err := http.NewRequestWithContext(ctx, "GET", config.URL, nil)
if err != nil {
config.Out <- CtrlHTTPResponse{Failure: newfailure(err)}
config.Out <- CtrlHTTPResponse{ // fix: emit -1 like the old test helper does
BodyLength: -1,
Failure: newfailure(err),
StatusCode: -1,
}
return
}
// The original test helper failed with extra headers while here
@ -45,7 +49,11 @@ func HTTPDo(ctx context.Context, config *HTTPConfig) {
}
resp, err := config.Client.Do(req)
if err != nil {
config.Out <- CtrlHTTPResponse{Failure: newfailure(err)}
config.Out <- CtrlHTTPResponse{ // fix: emit -1 like old test helper does
BodyLength: -1,
Failure: newfailure(err),
StatusCode: -1,
}
return
}
defer resp.Body.Close()