chore: sync with upstream

ooni · Nov 24, 2024 · b933b81 · b933b81
1 parent 4cc200b
commit b933b81
Show file tree

Hide file tree

Showing 8 changed files with 1,183 additions and 5 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v4
       with:
-        go-version: "1.21.8"
+        go-version: "1.22.2"
 
     - name: Build
       run: go build -v ./...

diff --git a/cgi/cgi_main.go b/cgi/cgi_main.go
@@ -7,12 +7,13 @@ package cgi
 import (
 	"fmt"
 	"io"
-	"net/http"
 	"os"
 	"path"
 	"sort"
 	"strings"
 	"time"
+
+	http "github.com/ooni/oohttp"
 )
 
 func cgiMain() {

diff --git a/cgi/host_test.go b/cgi/host_test.go
@@ -9,7 +9,6 @@ package cgi
 import (
 	"bufio"
 	"fmt"
-	"internal/testenv"
 	"io"
 	"net"
 	"os"
@@ -23,6 +22,7 @@ import (
 
 	http "github.com/ooni/oohttp"
 	httptest "github.com/ooni/oohttp/httptest"
+	testenv "github.com/ooni/oohttp/internal/testenv"
 )
 
 // TestMain executes the test binary as the cgi server if