Skip to content

Commit 1007290

Browse files
committed
🔀 Merge branch 'testing'
2 parents c5b9c14 + 227be0b commit 1007290

File tree

7 files changed

+139
-59
lines changed

7 files changed

+139
-59
lines changed

README.md

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -97,27 +97,14 @@ interpreter such as lua, perl or python.
9797

9898
### Requirements
9999

100-
- This module needs to be installed (obviously).
100+
This module needs to be installed (obviously).
101101

102-
Refer to the Caddy documentation on how to build Caddy with
103-
plugins/modules.
102+
Refer to the Caddy documentation on how to build Caddy with
103+
plugins/modules.
104104

105-
> **Note**: If you build manually, beware to include the major version
106-
> in the module path. For example
107-
> `xcaddy build --with github.com/aksdb/caddy-cgi/v2`.
108-
109-
- The directive needs to be registered in the Caddyfile:
110-
111-
``` caddy
112-
{
113-
order cgi before respond
114-
}
115-
```
116-
117-
Adjust the order as needed. Putting CGI before other response-writing
118-
handlers should be a sane default, since the CGI module is typically
119-
used with a specific matcher and will then take completely over.
120-
Manipulating the request after the CGI script is likely not necessary.
105+
> **Note**: If you build manually, beware to include the major version
106+
> in the module path. For example
107+
> `xcaddy build --with=github.com/aksdb/caddy-cgi/v2`.
121108
122109
### Basic Syntax
123110

doc.go

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -81,26 +81,14 @@ interpreter such as lua, perl or python.
8181
8282
# Requirements
8383
84-
- This module needs to be installed (obviously).
84+
This module needs to be installed (obviously).
8585
86-
Refer to the Caddy documentation on how to build Caddy with
87-
plugins/modules.
86+
Refer to the Caddy documentation on how to build Caddy with
87+
plugins/modules.
8888
89-
Note: If you build manually, beware to include the major version
90-
in the module path. For example
91-
xcaddy build --with=github.com/aksdb/caddy-cgi/v2.
92-
93-
- The directive needs to be registered in the Caddyfile:
94-
95-
{
96-
order cgi before respond
97-
}
98-
99-
Adjust the order as needed. Putting CGI before other
100-
response-writing handlers should be a sane default, since the CGI
101-
module is typically used with a specific matcher and will then take
102-
completely over. Manipulating the request after the CGI script is
103-
likely not necessary.
89+
Note: If you build manually, beware to include the major version in
90+
the module path. For example
91+
xcaddy build --with=github.com/aksdb/caddy-cgi/v2.
10492
10593
# Basic Syntax
10694

doc/document.md

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -87,25 +87,12 @@ such as lua, perl or python.
8787

8888
### Requirements
8989

90-
* This module needs to be installed (obviously).
91-
92-
Refer to the Caddy documentation on how to build Caddy with plugins/modules.
93-
94-
> **Note**: If you build manually, beware to include the major version in the
95-
> module path. For example `xcaddy build --with=github.com/aksdb/caddy-cgi/v2`.
96-
97-
* The directive needs to be registered in the Caddyfile:
98-
99-
```caddy
100-
{
101-
order cgi before respond
102-
}
103-
```
104-
105-
Adjust the order as needed. Putting CGI before other response-writing handlers
106-
should be a sane default, since the CGI module is typically used with a specific
107-
matcher and will then take completely over. Manipulating the request after the
108-
CGI script is likely not necessary.
90+
This module needs to be installed (obviously).
91+
92+
Refer to the Caddy documentation on how to build Caddy with plugins/modules.
93+
94+
> **Note**: If you build manually, beware to include the major version in the
95+
> module path. For example `xcaddy build --with=github.com/aksdb/caddy-cgi/v2`.
10996
11097
### Basic Syntax
11198

go.mod

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,41 +7,56 @@ toolchain go1.23.1
77
require (
88
github.com/caddyserver/caddy/v2 v2.8.4
99
github.com/dustin/go-humanize v1.0.1
10+
github.com/stretchr/testify v1.10.0
1011
go.uber.org/zap v1.27.0
1112
)
1213

1314
require (
1415
filippo.io/edwards25519 v1.1.0 // indirect
1516
github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect
17+
github.com/BurntSushi/toml v1.3.2 // indirect
1618
github.com/Masterminds/goutils v1.1.1 // indirect
1719
github.com/Masterminds/semver/v3 v3.2.0 // indirect
1820
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
1921
github.com/Microsoft/go-winio v0.6.0 // indirect
22+
github.com/alecthomas/chroma/v2 v2.13.0 // indirect
2023
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
2124
github.com/aryann/difflib v0.0.0-20210328193216-ff5ff6dc229b // indirect
2225
github.com/beorn7/perks v1.0.1 // indirect
2326
github.com/caddyserver/certmagic v0.21.3 // indirect
2427
github.com/caddyserver/zerossl v0.1.3 // indirect
28+
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
2529
github.com/cespare/xxhash v1.1.0 // indirect
2630
github.com/cespare/xxhash/v2 v2.2.0 // indirect
2731
github.com/chzyer/readline v1.5.1 // indirect
2832
github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
33+
github.com/davecgh/go-spew v1.1.1 // indirect
2934
github.com/dgraph-io/badger v1.6.2 // indirect
3035
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
3136
github.com/dgraph-io/ristretto v0.1.1 // indirect
3237
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
38+
github.com/dlclark/regexp2 v1.11.0 // indirect
39+
github.com/felixge/httpsnoop v1.0.4 // indirect
40+
github.com/fxamacker/cbor/v2 v2.6.0 // indirect
41+
github.com/go-chi/chi/v5 v5.0.12 // indirect
3342
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
3443
github.com/go-kit/kit v0.13.0 // indirect
3544
github.com/go-kit/log v0.2.1 // indirect
3645
github.com/go-logfmt/logfmt v0.6.0 // indirect
46+
github.com/go-logr/logr v1.4.1 // indirect
47+
github.com/go-logr/stdr v1.2.2 // indirect
3748
github.com/go-sql-driver/mysql v1.7.1 // indirect
3849
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
3950
github.com/golang/glog v1.2.0 // indirect
4051
github.com/golang/protobuf v1.5.4 // indirect
4152
github.com/golang/snappy v0.0.4 // indirect
4253
github.com/google/cel-go v0.20.1 // indirect
54+
github.com/google/certificate-transparency-go v1.1.8-0.20240110162603-74a5dd331745 // indirect
55+
github.com/google/go-tpm v0.9.0 // indirect
56+
github.com/google/go-tspi v0.3.0 // indirect
4357
github.com/google/pprof v0.0.0-20231212022811-ec68065c825e // indirect
4458
github.com/google/uuid v1.6.0 // indirect
59+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 // indirect
4560
github.com/huandu/xstrings v1.3.3 // indirect
4661
github.com/imdario/mergo v0.3.13 // indirect
4762
github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -66,7 +81,9 @@ require (
6681
github.com/mitchellh/go-ps v1.0.0 // indirect
6782
github.com/mitchellh/reflectwalk v1.0.2 // indirect
6883
github.com/onsi/ginkgo/v2 v2.13.2 // indirect
84+
github.com/pires/go-proxyproto v0.7.0 // indirect
6985
github.com/pkg/errors v0.9.1 // indirect
86+
github.com/pmezard/go-difflib v1.0.0 // indirect
7087
github.com/prometheus/client_golang v1.19.1 // indirect
7188
github.com/prometheus/client_model v0.5.0 // indirect
7289
github.com/prometheus/common v0.48.0 // indirect
@@ -77,8 +94,10 @@ require (
7794
github.com/russross/blackfriday/v2 v2.1.0 // indirect
7895
github.com/shopspring/decimal v1.3.1 // indirect
7996
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
97+
github.com/sirupsen/logrus v1.9.3 // indirect
8098
github.com/slackhq/nebula v1.6.1 // indirect
8199
github.com/smallstep/certificates v0.26.1 // indirect
100+
github.com/smallstep/go-attestation v0.4.4-0.20240109183208-413678f90935 // indirect
82101
github.com/smallstep/nosql v0.6.1 // indirect
83102
github.com/smallstep/pkcs7 v0.0.0-20231024181729-3b98ecc1ca81 // indirect
84103
github.com/smallstep/scep v0.0.0-20231024192529-aee96d7ad34d // indirect
@@ -89,8 +108,24 @@ require (
89108
github.com/stoewer/go-strcase v1.2.0 // indirect
90109
github.com/tailscale/tscert v0.0.0-20240517230440-bbccfbf48933 // indirect
91110
github.com/urfave/cli v1.22.14 // indirect
111+
github.com/x448/float16 v0.8.4 // indirect
112+
github.com/yuin/goldmark v1.7.1 // indirect
113+
github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc // indirect
92114
github.com/zeebo/blake3 v0.2.3 // indirect
93115
go.etcd.io/bbolt v1.3.9 // indirect
116+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
117+
go.opentelemetry.io/contrib/propagators/autoprop v0.42.0 // indirect
118+
go.opentelemetry.io/contrib/propagators/aws v1.17.0 // indirect
119+
go.opentelemetry.io/contrib/propagators/b3 v1.17.0 // indirect
120+
go.opentelemetry.io/contrib/propagators/jaeger v1.17.0 // indirect
121+
go.opentelemetry.io/contrib/propagators/ot v1.17.0 // indirect
122+
go.opentelemetry.io/otel v1.24.0 // indirect
123+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect
124+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 // indirect
125+
go.opentelemetry.io/otel/metric v1.24.0 // indirect
126+
go.opentelemetry.io/otel/sdk v1.21.0 // indirect
127+
go.opentelemetry.io/otel/trace v1.24.0 // indirect
128+
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
94129
go.step.sm/cli-utils v0.9.0 // indirect
95130
go.step.sm/crypto v0.45.0 // indirect
96131
go.step.sm/linkedca v0.20.1 // indirect
@@ -113,6 +148,7 @@ require (
113148
google.golang.org/genproto/googleapis/rpc v0.0.0-20240429193739-8cf5692501f6 // indirect
114149
google.golang.org/grpc v1.63.2 // indirect
115150
google.golang.org/protobuf v1.34.1 // indirect
151+
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
116152
gopkg.in/yaml.v3 v3.0.1 // indirect
117153
howett.net/plist v1.0.0 // indirect
118154
)

0 commit comments

Comments
 (0)