From 5032678ef29abc059a7c6ff7e7919dc238d58744 Mon Sep 17 00:00:00 2001 From: desperateee Date: Wed, 23 Nov 2022 00:12:11 +0100 Subject: [PATCH] change to refraction --- alpn_test.go | 2 +- cgi/child.go | 2 +- client.go | 3 ++- client_test.go | 2 +- clientserver_test.go | 2 +- example_client_test.go | 2 +- h2_bundle.go | 2 +- http2/client_conn_pool.go | 2 +- http2/fhttp_test.go | 2 +- http2/h2demo/h2demo.go | 3 ++- http2/h2i/h2i.go | 2 +- http2/http2.go | 2 +- http2/server.go | 2 +- http2/server_test.go | 2 +- http2/transport.go | 2 +- http2/transport_test.go | 2 +- httptest/httptest.go | 2 +- httptest/httptest_test.go | 2 +- httptest/server.go | 2 +- httptrace/trace.go | 2 +- request.go | 2 +- response.go | 3 ++- serve_test.go | 2 +- server.go | 3 ++- transport.go | 2 +- transport_internal_test.go | 2 +- transport_test.go | 2 +- 27 files changed, 31 insertions(+), 27 deletions(-) diff --git a/alpn_test.go b/alpn_test.go index 80c247dd..4587768d 100644 --- a/alpn_test.go +++ b/alpn_test.go @@ -13,7 +13,7 @@ import ( "strings" "testing" - tls "github.com/desperatee/utls" + tls "github.com/refraction-networking/utls" . "github.com/desperatee/fhttp" "github.com/desperatee/fhttp/httptest" diff --git a/cgi/child.go b/cgi/child.go index e7858649..b2ad5abd 100644 --- a/cgi/child.go +++ b/cgi/child.go @@ -18,7 +18,7 @@ import ( "strconv" "strings" - tls "github.com/desperatee/utls" + tls "github.com/refraction-networking/utls" http "github.com/desperatee/fhttp" ) diff --git a/client.go b/client.go index 097eed7d..ceb4d4ec 100644 --- a/client.go +++ b/client.go @@ -11,7 +11,6 @@ package http import ( "context" - tls "github.com/desperatee/utls" "encoding/base64" "errors" "fmt" @@ -23,6 +22,8 @@ import ( "strings" "sync" "time" + + tls "github.com/refraction-networking/utls" ) // A Client is an HTTP client. Its zero value (DefaultClient) is a diff --git a/client_test.go b/client_test.go index 8f1cdb8f..f0aaacd9 100644 --- a/client_test.go +++ b/client_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - tls "github.com/desperatee/utls" + tls "github.com/refraction-networking/utls" . "github.com/desperatee/fhttp" "github.com/desperatee/fhttp/cookiejar" diff --git a/clientserver_test.go b/clientserver_test.go index c45ac9b6..70cb7add 100644 --- a/clientserver_test.go +++ b/clientserver_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - tls "github.com/desperatee/utls" + tls "github.com/refraction-networking/utls" . "github.com/desperatee/fhttp" "github.com/desperatee/fhttp/httptest" diff --git a/example_client_test.go b/example_client_test.go index b862c182..3026334a 100644 --- a/example_client_test.go +++ b/example_client_test.go @@ -11,7 +11,7 @@ import ( "strings" "testing" - tls "github.com/desperatee/utls" + tls "github.com/refraction-networking/utls" http "github.com/desperatee/fhttp" "github.com/desperatee/fhttp/http2" diff --git a/h2_bundle.go b/h2_bundle.go index bb7fc1b1..750bbc84 100644 --- a/h2_bundle.go +++ b/h2_bundle.go @@ -28,7 +28,7 @@ import ( "bytes" "context" "crypto/rand" - tls "github.com/desperatee/utls" + tls "github.com/refraction-networking/utls" "encoding/binary" "errors" "fmt" diff --git a/http2/client_conn_pool.go b/http2/client_conn_pool.go index 07d3fd97..5d5f220c 100644 --- a/http2/client_conn_pool.go +++ b/http2/client_conn_pool.go @@ -9,7 +9,7 @@ package http2 import ( "sync" - tls "github.com/desperatee/utls" + tls "github.com/refraction-networking/utls" http "github.com/desperatee/fhttp" ) diff --git a/http2/fhttp_test.go b/http2/fhttp_test.go index 74755cc1..b83a12e9 100644 --- a/http2/fhttp_test.go +++ b/http2/fhttp_test.go @@ -14,7 +14,7 @@ import ( "github.com/desperatee/fhttp/cookiejar" "github.com/desperatee/fhttp/httptest" - tls "github.com/desperatee/utls" + tls "github.com/refraction-networking/utls" "golang.org/x/net/publicsuffix" http "github.com/desperatee/fhttp" diff --git a/http2/h2demo/h2demo.go b/http2/h2demo/h2demo.go index b5aaaae7..91bacacd 100644 --- a/http2/h2demo/h2demo.go +++ b/http2/h2demo/h2demo.go @@ -7,7 +7,6 @@ package main import ( "bytes" "context" - tls "github.com/desperatee/utls" "flag" "fmt" "hash/crc32" @@ -26,6 +25,8 @@ import ( "sync" "time" + tls "github.com/refraction-networking/utls" + "cloud.google.com/go/storage" "github.com/Carcraftz/fhttp/http2" "go4.org/syncutil/singleflight" diff --git a/http2/h2i/h2i.go b/http2/h2i/h2i.go index bdbd20e5..274efa9f 100644 --- a/http2/h2i/h2i.go +++ b/http2/h2i/h2i.go @@ -35,7 +35,7 @@ import ( "strconv" "strings" - tls "github.com/desperatee/utls" + tls "github.com/refraction-networking/utls" "github.com/desperatee/fhttp/http2" "github.com/desperatee/fhttp/http2/hpack" diff --git a/http2/http2.go b/http2/http2.go index 45051e5a..cb897f53 100644 --- a/http2/http2.go +++ b/http2/http2.go @@ -26,7 +26,7 @@ import ( "strings" "sync" - tls "github.com/desperatee/utls" + tls "github.com/refraction-networking/utls" http "github.com/desperatee/fhttp" diff --git a/http2/server.go b/http2/server.go index c2d9cfb5..acabcaff 100644 --- a/http2/server.go +++ b/http2/server.go @@ -45,7 +45,7 @@ import ( "sync" "time" - tls "github.com/desperatee/utls" + tls "github.com/refraction-networking/utls" http "github.com/desperatee/fhttp" "github.com/desperatee/fhttp/http2/hpack" diff --git a/http2/server_test.go b/http2/server_test.go index cce723ae..3856b508 100644 --- a/http2/server_test.go +++ b/http2/server_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - tls "github.com/desperatee/utls" + tls "github.com/refraction-networking/utls" http "github.com/desperatee/fhttp" "github.com/desperatee/fhttp/httptest" diff --git a/http2/transport.go b/http2/transport.go index db8bed60..002a9553 100644 --- a/http2/transport.go +++ b/http2/transport.go @@ -27,7 +27,7 @@ import ( "sync/atomic" "time" - tls "github.com/desperatee/utls" + tls "github.com/refraction-networking/utls" http "github.com/desperatee/fhttp" "github.com/desperatee/fhttp/httptrace" diff --git a/http2/transport_test.go b/http2/transport_test.go index 216098ad..d098a915 100644 --- a/http2/transport_test.go +++ b/http2/transport_test.go @@ -31,7 +31,7 @@ import ( "testing" "time" - tls "github.com/desperatee/utls" + tls "github.com/refraction-networking/utls" http "github.com/desperatee/fhttp" "github.com/desperatee/fhttp/http2/hpack" diff --git a/httptest/httptest.go b/httptest/httptest.go index 1cac4dd7..6cd54a7b 100644 --- a/httptest/httptest.go +++ b/httptest/httptest.go @@ -11,7 +11,7 @@ import ( "io" "strings" - tls "github.com/desperatee/utls" + tls "github.com/refraction-networking/utls" http "github.com/desperatee/fhttp" ) diff --git a/httptest/httptest_test.go b/httptest/httptest_test.go index 6245bc20..26449e87 100644 --- a/httptest/httptest_test.go +++ b/httptest/httptest_test.go @@ -11,7 +11,7 @@ import ( "strings" "testing" - tls "github.com/desperatee/utls" + tls "github.com/refraction-networking/utls" http "github.com/desperatee/fhttp" ) diff --git a/httptest/server.go b/httptest/server.go index 2036b4e9..648f7477 100644 --- a/httptest/server.go +++ b/httptest/server.go @@ -17,7 +17,7 @@ import ( "sync" "time" - tls "github.com/desperatee/utls" + tls "github.com/refraction-networking/utls" http "github.com/desperatee/fhttp" "github.com/desperatee/fhttp/internal" diff --git a/httptrace/trace.go b/httptrace/trace.go index 9fe11262..5e4a305c 100644 --- a/httptrace/trace.go +++ b/httptrace/trace.go @@ -13,7 +13,7 @@ import ( "reflect" "time" - tls "github.com/desperatee/utls" + tls "github.com/refraction-networking/utls" "github.com/desperatee/fhttp/internal/nettrace" ) diff --git a/request.go b/request.go index f3db90dd..9ea8f2db 100644 --- a/request.go +++ b/request.go @@ -24,7 +24,7 @@ import ( "strings" "sync" - tls "github.com/desperatee/utls" + tls "github.com/refraction-networking/utls" "github.com/desperatee/fhttp/httptrace" diff --git a/response.go b/response.go index 2a063532..76990968 100644 --- a/response.go +++ b/response.go @@ -9,7 +9,6 @@ package http import ( "bufio" "bytes" - tls "github.com/desperatee/utls" "errors" "fmt" "io" @@ -18,6 +17,8 @@ import ( "strconv" "strings" + tls "github.com/refraction-networking/utls" + "golang.org/x/net/http/httpguts" ) diff --git a/serve_test.go b/serve_test.go index 9ea57405..aa58dedc 100644 --- a/serve_test.go +++ b/serve_test.go @@ -35,7 +35,7 @@ import ( "testing" "time" - tls "github.com/desperatee/utls" + tls "github.com/refraction-networking/utls" . "github.com/desperatee/fhttp" "github.com/desperatee/fhttp/httptest" diff --git a/server.go b/server.go index 3219cba0..efed97be 100644 --- a/server.go +++ b/server.go @@ -10,7 +10,6 @@ import ( "bufio" "bytes" "context" - tls "github.com/desperatee/utls" "errors" "fmt" "io" @@ -30,6 +29,8 @@ import ( "sync/atomic" "time" + tls "github.com/refraction-networking/utls" + "golang.org/x/net/http/httpguts" ) diff --git a/transport.go b/transport.go index cae1fd2f..5571ce34 100644 --- a/transport.go +++ b/transport.go @@ -28,7 +28,7 @@ import ( "sync/atomic" "time" - tls "github.com/desperatee/utls" + tls "github.com/refraction-networking/utls" "github.com/desperatee/fhttp/httptrace" diff --git a/transport_internal_test.go b/transport_internal_test.go index b2431c4e..238871a4 100644 --- a/transport_internal_test.go +++ b/transport_internal_test.go @@ -16,7 +16,7 @@ import ( "strings" "testing" - tls "github.com/desperatee/utls" + tls "github.com/refraction-networking/utls" "github.com/desperatee/fhttp/internal" ) diff --git a/transport_test.go b/transport_test.go index a5782dd7..66e4f213 100644 --- a/transport_test.go +++ b/transport_test.go @@ -37,7 +37,7 @@ import ( "testing/iotest" "time" - tls "github.com/desperatee/utls" + tls "github.com/refraction-networking/utls" . "github.com/desperatee/fhttp" "github.com/desperatee/fhttp/httptest"