Skip to content

Commit 97dcf55

Browse files
committed
support keyword http-drop-request-trailers in defaults and backend sections
Signed-off-by: Vincent Gramer <vgramer@haproxy.com>
1 parent 23f34c7 commit 97dcf55

13 files changed

Lines changed: 150 additions & 4 deletions

config-parser/section-parsers.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ func (p *configParser) getDefaultParser() *Parsers {
105105
addParser(parser, &sequence, &simple.Option{Name: "dontlognull"})
106106
addParser(parser, &sequence, &simple.Option{Name: "log-separate-errors"})
107107
addParser(parser, &sequence, &simple.Option{Name: "http-buffer-request"})
108+
addParser(parser, &sequence, &simple.Option{Name: "http-drop-request-trailers"})
108109
addParser(parser, &sequence, &simple.Option{Name: "http-server-close"})
109110
addParser(parser, &sequence, &simple.Option{Name: "http-keep-alive"})
110111
addParser(parser, &sequence, &simple.Option{Name: "http-pretend-keepalive"})
@@ -584,6 +585,7 @@ func (p *configParser) getBackendParser() *Parsers {
584585
addParser(parser, &sequence, &simple.Option{Name: "httpclose"})
585586
addParser(parser, &sequence, &simple.Option{Name: "forceclose"})
586587
addParser(parser, &sequence, &simple.Option{Name: "http-buffer-request"})
588+
addParser(parser, &sequence, &simple.Option{Name: "http-drop-request-trailers"})
587589
addParser(parser, &sequence, &simple.Option{Name: "http-server-close"})
588590
addParser(parser, &sequence, &simple.Option{Name: "http-keep-alive"})
589591
addParser(parser, &sequence, &simple.Option{Name: "http-pretend-keepalive"})

config-parser/tests/configs/haproxy.cfg.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ defaults A
8989
log-format '%ci:%cp [%tr] %ft %b/%s %TR/%Tw/%Tc/%Tr/%Ta %ST %B %CC %CS %tsc %ac/%fc/%bc/%sc/%rc %sq/%bq %hr %hs "%HM %[var(txn.base)] %HV"'
9090
option redispatch
9191
option dontlognull
92+
no option http-drop-request-trailers
9293
option http-server-close
9394
option http-keep-alive
9495
no option checkcache
@@ -323,6 +324,7 @@ frontend xyz5 from A
323324
324325
backend default_backend from A
325326
mode http
327+
no option http-drop-request-trailers
326328
option checkcache
327329
option independent-streams
328330
option nolinger

models/backend_base.go

Lines changed: 51 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

models/backend_base_compare.go

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

models/backend_base_compare_test.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

models/defaults_base.go

Lines changed: 51 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

models/defaults_base_compare.go

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

models/defaults_base_compare_test.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

specification/build/haproxy_spec.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2697,6 +2697,12 @@ definitions:
26972697
- disabled
26982698
type: string
26992699
x-display-name: HTTP bufferrequest
2700+
http-drop-request-trailers:
2701+
enum:
2702+
- enabled
2703+
- disabled
2704+
type: string
2705+
x-display-name: Drop HTTP Request Trailers
27002706
http-use-htx:
27012707
enum:
27022708
- enabled
@@ -3695,6 +3701,12 @@ definitions:
36953701
mode:
36963702
value: http
36973703
x-display-name: HTTP bufferrequest
3704+
http-drop-request-trailers:
3705+
enum:
3706+
- enabled
3707+
- disabled
3708+
type: string
3709+
x-display-name: Drop HTTP Request Trailers
36983710
http-no-delay:
36993711
enum:
37003712
- enabled

specification/models/configuration/backend.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,10 @@ backend_base:
309309
type: string
310310
enum: [enabled, disabled]
311311
x-display-name: Checkcache
312+
http-drop-request-trailers:
313+
type: string
314+
enum: [ enabled, disabled ]
315+
x-display-name: Drop HTTP Request Trailers
312316
independent_streams:
313317
type: string
314318
enum: [enabled, disabled]

0 commit comments

Comments
 (0)