diff --git a/http_client.go b/http_client.go index ea89811..f9ab412 100644 --- a/http_client.go +++ b/http_client.go @@ -21,6 +21,7 @@ type HTTPClientConfig struct { FollowRedirects int Debug bool OriginalHost bool + Timeout time.Duration } type HTTPClient struct { @@ -43,6 +44,10 @@ func NewHTTPClient(baseURL string, config *HTTPClientConfig) *HTTPClient { u.Host += ":" + defaultPorts[u.Scheme] } + if config.Timeout.Nanoseconds() == 0 { + config.Timeout = 5 * time.Second + } + client := new(HTTPClient) client.baseURL = u.String() client.host = u.Host @@ -112,7 +117,7 @@ func (c *HTTPClient) Send(data []byte) (response []byte, err error) { } } - timeout := time.Now().Add(5 * time.Second) + timeout := time.Now().Add(c.config.Timeout) c.conn.SetWriteDeadline(timeout) diff --git a/output_http.go b/output_http.go index 907fc28..2908b2e 100644 --- a/output_http.go +++ b/output_http.go @@ -18,6 +18,7 @@ type HTTPOutputConfig struct { elasticSearch string + Timeout time.Duration OriginalHost bool Debug bool @@ -97,6 +98,7 @@ func (o *HTTPOutput) startWorker() { FollowRedirects: o.config.redirectLimit, Debug: o.config.Debug, OriginalHost: o.config.OriginalHost, + Timeout: o.config.Timeout, }) deathCount := 0 diff --git a/settings.go b/settings.go index 8bcc7c9..dd2a000 100644 --- a/settings.go +++ b/settings.go @@ -87,6 +87,7 @@ func init() { flag.Var(&Settings.outputHTTP, "output-http", "Forwards incoming requests to given http address.\n\t# Redirect all incoming requests to staging.com address \n\tgor --input-raw :80 --output-http http://staging.com") flag.IntVar(&Settings.outputHTTPConfig.workers, "output-http-workers", 0, "Gor uses dynamic worker scaling by default. Enter a number to run a set number of workers.") flag.IntVar(&Settings.outputHTTPConfig.redirectLimit, "output-http-redirects", 0, "Enable how often redirects should be followed.") + flag.DurationVar(&Settings.outputHTTPConfig.Timeout, "output-http-timeout", 0, "Specify HTTP request/response timeout. By default 5s. Example: --output-http-timeout 30s") flag.BoolVar(&Settings.outputHTTPConfig.stats, "output-http-stats", false, "Report http output queue stats to console every 5 seconds.")