Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions common/httpx/httpx.go
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,10 @@ func New(options *Options) (*HTTPX, error) {
Timeout: httpx.Options.Timeout,
CheckRedirect: redirectFunc,
}, retryablehttpOptions)
if httpx.Options.Protocol == "http11" {
// Explicitly prevent retryablehttp from falling back to a native HTTP/2 client.
httpx.client.HTTPClient2 = httpx.client.HTTPClient
}

transport2 := &http2.Transport{
TLSClientConfig: &tls.Config{
Expand Down
35 changes: 33 additions & 2 deletions common/httpx/httpx_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package httpx

import (
"net/http"
"net/http/httptest"
"testing"

"github.com/projectdiscovery/retryablehttp-go"
Expand All @@ -13,18 +14,48 @@ func TestDo(t *testing.T) {
require.Nil(t, err)

t.Run("content-length in header", func(t *testing.T) {
req, err := retryablehttp.NewRequest(http.MethodGet, "https://scanme.sh", nil)
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
body := []byte("OK")
w.Header().Set("Content-Length", "2")
_, _ = w.Write(body)
}))
defer server.Close()

req, err := retryablehttp.NewRequest(http.MethodGet, server.URL, nil)
require.Nil(t, err)
resp, err := ht.Do(req, UnsafeOptions{})
require.Nil(t, err)
require.Equal(t, 2, resp.ContentLength)
})

t.Run("content-length with binary body", func(t *testing.T) {
req, err := retryablehttp.NewRequest(http.MethodGet, "https://www.w3schools.com/images/favicon.ico", nil)
binary := make([]byte, 1024)
for i := range binary {
binary[i] = byte(i % 256)
}
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Length", "1024")
_, _ = w.Write(binary)
}))
defer server.Close()

req, err := retryablehttp.NewRequest(http.MethodGet, server.URL, nil)
require.Nil(t, err)
resp, err := ht.Do(req, UnsafeOptions{})
require.Nil(t, err)
require.Greater(t, len(resp.Raw), 800)
require.Equal(t, len(binary), resp.ContentLength)
})
}

func TestHTTP11DisablesHTTP2Fallback(t *testing.T) {
options := DefaultOptions
options.Protocol = HTTP11

ht, err := New(&options)
require.NoError(t, err)
require.NotNil(t, ht.client)

// When protocol is http11, retryablehttp should not use a separate HTTP/2 fallback client.
require.Same(t, ht.client.HTTPClient, ht.client.HTTPClient2)
}