Skip to content

Commit d1176cf

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

12 files changed

Lines changed: 149 additions & 4 deletions

config-parser/section-parsers.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ func (p *configParser) getDefaultParser() *Parsers {
106106
addParser(parser, &sequence, &simple.Option{Name: "log-separate-errors"})
107107
addParser(parser, &sequence, &simple.Option{Name: "http-buffer-request"})
108108
addParser(parser, &sequence, &simple.Option{Name: "http-drop-request-trailers"})
109+
addParser(parser, &sequence, &simple.Option{Name: "http-drop-response-trailers"})
109110
addParser(parser, &sequence, &simple.Option{Name: "http-server-close"})
110111
addParser(parser, &sequence, &simple.Option{Name: "http-keep-alive"})
111112
addParser(parser, &sequence, &simple.Option{Name: "http-pretend-keepalive"})
@@ -494,6 +495,7 @@ func (p *configParser) getFrontendParser() *Parsers {
494495
addParser(parser, &sequence, &simple.Option{Name: "httpclose"})
495496
addParser(parser, &sequence, &simple.Option{Name: "forceclose"})
496497
addParser(parser, &sequence, &simple.Option{Name: "http-buffer-request"})
498+
addParser(parser, &sequence, &simple.Option{Name: "http-drop-response-trailers"})
497499
addParser(parser, &sequence, &simple.Option{Name: "http-server-close"})
498500
addParser(parser, &sequence, &simple.Option{Name: "http-keep-alive"})
499501
addParser(parser, &sequence, &simple.Option{Name: "http-use-htx"})
@@ -722,6 +724,7 @@ func (p *configParser) getListenParser() *Parsers {
722724
addParser(parser, &sequence, &simple.Option{Name: "httpclose"})
723725
addParser(parser, &sequence, &simple.Option{Name: "forceclose"})
724726
addParser(parser, &sequence, &simple.Option{Name: "http-buffer-request"})
727+
addParser(parser, &sequence, &simple.Option{Name: "http-drop-response-trailers"})
725728
addParser(parser, &sequence, &simple.Option{Name: "http-server-close"})
726729
addParser(parser, &sequence, &simple.Option{Name: "http-keep-alive"})
727730
addParser(parser, &sequence, &simple.Option{Name: "http-pretend-keepalive"})

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.

models/frontend_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/frontend_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/frontend_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
@@ -2703,6 +2703,12 @@ definitions:
27032703
- disabled
27042704
type: string
27052705
x-display-name: Drop HTTP Request Trailers
2706+
http-drop-response-trailers:
2707+
enum:
2708+
- enabled
2709+
- disabled
2710+
type: string
2711+
x-display-name: Drop HTTP Response Trailers
27062712
http-use-htx:
27072713
enum:
27082714
- enabled
@@ -3223,6 +3229,12 @@ definitions:
32233229
- disabled
32243230
type: string
32253231
x-display-name: HTTP bufferrequest
3232+
http-drop-response-trailers:
3233+
enum:
3234+
- enabled
3235+
- disabled
3236+
type: string
3237+
x-display-name: Drop HTTP Response Trailers
32263238
http-use-htx:
32273239
enum:
32283240
- enabled

specification/models/configuration/defaults.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,10 @@ defaults_base:
132132
type: string
133133
enum: [ enabled, disabled ]
134134
x-display-name: Drop HTTP Request Trailers
135+
http-drop-response-trailers:
136+
type: string
137+
enum: [ enabled, disabled ]
138+
x-display-name: Drop HTTP Response Trailers
135139
httplog:
136140
type: boolean
137141
x-display-name: HTTP Log

specification/models/configuration/frontend.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,10 @@ frontend_base:
121121
x-dependency:
122122
mode:
123123
value: http
124+
http-drop-response-trailers:
125+
type: string
126+
enum: [ enabled, disabled ]
127+
x-display-name: Drop HTTP Response Trailers
124128
client_timeout:
125129
type: integer
126130
minimum: 0

0 commit comments

Comments
 (0)