Skip to content

Commit bb3154f

Browse files
Merge pull request #2155 from projectdiscovery/dev
v1.7.0
2 parents a10bd2d + 34392b1 commit bb3154f

File tree

21 files changed

+200
-185
lines changed

21 files changed

+200
-185
lines changed

.github/workflows/build-test.yml

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,31 @@ on:
88
workflow_dispatch:
99

1010
jobs:
11+
lint:
12+
name: Lint Test
13+
if: "${{ !endsWith(github.actor, '[bot]') }}"
14+
runs-on: ubuntu-latest
15+
steps:
16+
- uses: actions/checkout@v4
17+
- uses: projectdiscovery/actions/setup/go@v1
18+
- name: Run golangci-lint
19+
uses: golangci/golangci-lint-action@v5
20+
with:
21+
version: latest
22+
args: --timeout 5m
23+
working-directory: .
24+
1125
build:
1226
name: Test Builds
27+
needs: [lint]
1328
runs-on: ${{ matrix.os }}
1429
strategy:
1530
matrix:
1631
os: [ubuntu-latest, windows-latest, macOS-latest]
1732
steps:
18-
- name: Set up Go
19-
uses: actions/setup-go@v4
20-
with:
21-
go-version: 1.21.x
22-
23-
- name: Check out code
24-
uses: actions/checkout@v3
25-
26-
- name: Build
27-
run: go build .
33+
- uses: actions/checkout@v4
34+
- uses: projectdiscovery/actions/setup/go@v1
35+
- run: go build .
2836
working-directory: cmd/httpx/
2937

3038
- name: Test

.github/workflows/compatibility-checks.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,6 @@ jobs:
1414
contents: write
1515
steps:
1616
- uses: actions/checkout@v4
17-
- uses: projectdiscovery/actions/setup/go/compatibility-checks@master
17+
- uses: projectdiscovery/actions/setup/go/compat-checks@master
18+
with:
19+
go-version-file: 'go.mod'

.github/workflows/lint-test.yml

Lines changed: 0 additions & 26 deletions
This file was deleted.

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ cmd/functional-test/*.cfg
1212
.devcontainer
1313
/httpx
1414
/dist
15-
/resume.cfg
15+
/resume.cfg
16+
vendor/

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ HEADLESS:
129129
-system-chrome enable using local installed chrome for screenshot
130130
-ho, -headless-options string[] start headless chrome with additional options
131131
-esb, -exclude-screenshot-bytes enable excluding screenshot bytes from json output
132+
-no-screenshot-full-page disable saving full page screenshot
132133
-ehb, -exclude-headless-body enable excluding headless header from json output
133134
-st, -screenshot-timeout value set timeout for screenshot in seconds (default 10s)
134135
-sid, -screenshot-idle value set idle time before taking screenshot in seconds (default 1s)

common/customheader/doc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
// Package customheader contains all the funcionality to deal with Custom Global Headers
1+
// Package customheader contains all the functionality to deal with Custom Global Headers
22
package customheader

common/customlist/doc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
// Package customlist contains all the funcionality to deal with Custom Target List
1+
// Package customlist contains all the functionality to deal with Custom Target List
22
package customlist

common/customports/doc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
// Package customport contains all the funcionality to deal with HTTP ports
1+
// Package customport contains all the functionality to deal with HTTP ports
22
package customport

common/fileutil/doc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
// Package fileutil contains all the funcionality related to deal with files
1+
// Package fileutil contains all the functionality related to deal with files
22
package fileutil

common/hashes/jarm/onetimepool.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"go.uber.org/multierr"
1010
)
1111

12-
// oneTimePool is a pool designed to create continous bare connections that are for one time only usage
12+
// oneTimePool is a pool designed to create continuous bare connections that are for one time only usage
1313
type oneTimePool struct {
1414
address string
1515
idleConnections chan net.Conn

0 commit comments

Comments
 (0)