Skip to content

Commit

Permalink
httpcaddyfile: Add compression to http transport config (#3624)
Browse files Browse the repository at this point in the history
* httpcaddyfile: Add `compression` to http transport config

* Add caddyfile adapt test for typical h2c setup
  • Loading branch information
Vigilans authored Jul 31, 2020
1 parent 6a14e2c commit 6f73a35
Show file tree
Hide file tree
Showing 2 changed files with 104 additions and 0 deletions.
96 changes: 96 additions & 0 deletions caddytest/integration/caddyfile_adapt/reverse_proxy_h2c.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@

https://example.com {
reverse_proxy /path http://localhost:54321 {
header_up Host {host}
header_up X-Real-IP {remote}
header_up X-Forwarded-For {remote}
header_up X-Forwarded-Port {server_port}
header_up X-Forwarded-Proto "http"
transport http {
versions h2c 2
compression off
}
}
}

----------
{
"apps": {
"http": {
"servers": {
"srv0": {
"listen": [
":443"
],
"routes": [
{
"match": [
{
"host": [
"example.com"
]
}
],
"handle": [
{
"handler": "subroute",
"routes": [
{
"handle": [
{
"handler": "reverse_proxy",
"headers": {
"request": {
"set": {
"Host": [
"{http.request.host}"
],
"X-Forwarded-For": [
"{http.request.remote}"
],
"X-Forwarded-Port": [
"{server_port}"
],
"X-Forwarded-Proto": [
"http"
],
"X-Real-Ip": [
"{http.request.remote}"
]
}
}
},
"transport": {
"compression": false,
"protocol": "http",
"versions": [
"h2c",
"2"
]
},
"upstreams": [
{
"dial": "localhost:54321"
}
]
}
],
"match": [
{
"path": [
"/path"
]
}
]
}
]
}
],
"terminal": true
}
]
}
}
}
}
}
8 changes: 8 additions & 0 deletions modules/caddyhttp/reverseproxy/caddyfile.go
Original file line number Diff line number Diff line change
Expand Up @@ -719,6 +719,14 @@ func (h *HTTPTransport) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
return d.ArgErr()
}

case "compression":
if d.NextArg() {
if d.Val() == "off" {
var disable bool
h.Compression = &disable
}
}

default:
return d.Errf("unrecognized subdirective %s", d.Val())
}
Expand Down

0 comments on commit 6f73a35

Please sign in to comment.