kayos/zgrab2
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Resolves merge conflict to fix timeouts.

Browse Source
This commit is contained in:
clayzim 2018-07-10 15:10:24 -04:00
commit 544652de9d
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/ipp/scanner.go
View File

@ -15,7 +15,6 @@ import (
"net/url"
"strconv"
"strings"
"time"
log "github.com/sirupsen/logrus"
"github.com/zmap/zgrab2"
@ -661,7 +660,11 @@ func (scanner *Scanner) newIPPScan(target *zgrab2.ScanTarget, tls bool) *scan {
MaxIdleConnsPerHost: scanner.config.MaxRedirects,
}
transport.DialTLS = newScan.getTLSDialer(scanner)
<<<<<<< HEAD
transport.DialContext = zgrab2.GetTimeoutConnectionDialer(scanner.config.BaseFlags.Timeout).DialContext
=======
transport.DialContext = zgrab2.GetTimeoutConnectionDialer(scanner.config.Timeout).DialContext
>>>>>>> master
newScan.client.CheckRedirect = newScan.getCheckRedirect(scanner)
newScan.client.UserAgent = scanner.config.UserAgent
newScan.client.Transport = transport