Skip to content

Commit 2ae50a4

Browse files
committed
CLEANUP/MEDIUM: specification: remove unsupported http-use-htx and http-proxy options
1 parent 624a7af commit 2ae50a4

22 files changed

Lines changed: 8 additions & 302 deletions

.aspell.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ allowed:
109109
- http
110110
- https
111111
- httpCLF
112+
- htx
112113
- iana
113114
- ineffassign
114115
- infos
@@ -154,6 +155,7 @@ allowed:
154155
- packagetag
155156
- param
156157
- params
158+
- parsers
157159
- parallelize
158160
- passthrough
159161
- placholder

config-parser/section-parsers.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ func (p *configParser) getDefaultParser() *Parsers {
101101
addParser(parser, &sequence, &parsers.BindProcess{})
102102
addParser(parser, &sequence, &simple.Option{Name: "tcplog"})
103103
addParser(parser, &sequence, &simple.Option{Name: "httpclose"})
104-
addParser(parser, &sequence, &simple.Option{Name: "http-use-htx"})
105104
addParser(parser, &sequence, &parsers.OptionRedispatch{})
106105
addParser(parser, &sequence, &simple.Option{Name: "dontlognull"})
107106
addParser(parser, &sequence, &simple.Option{Name: "log-separate-errors"})
@@ -112,7 +111,6 @@ func (p *configParser) getDefaultParser() *Parsers {
112111
addParser(parser, &sequence, &simple.Option{Name: "http-keep-alive"})
113112
addParser(parser, &sequence, &simple.Option{Name: "http-pretend-keepalive"})
114113
addParser(parser, &sequence, &simple.Option{Name: "http-no-delay"})
115-
addParser(parser, &sequence, &simple.Option{Name: "http-proxy"})
116114
addParser(parser, &sequence, &simple.Option{Name: "tcpka"})
117115
addParser(parser, &sequence, &simple.Option{Name: "clitcpka"})
118116
addParser(parser, &sequence, &simple.Option{Name: "srvtcpka"})
@@ -518,9 +516,7 @@ func (p *configParser) getFrontendParser() *Parsers {
518516
addParser(parser, &sequence, &simple.Option{Name: "http-drop-response-trailers"})
519517
addParser(parser, &sequence, &simple.Option{Name: "http-server-close"})
520518
addParser(parser, &sequence, &simple.Option{Name: "http-keep-alive"})
521-
addParser(parser, &sequence, &simple.Option{Name: "http-use-htx"})
522519
addParser(parser, &sequence, &simple.Option{Name: "http-no-delay"})
523-
addParser(parser, &sequence, &simple.Option{Name: "http-proxy"})
524520
addParser(parser, &sequence, &parsers.OptionForwardFor{})
525521
addParser(parser, &sequence, &simple.Option{Name: "tcplog"})
526522
addParser(parser, &sequence, &simple.Option{Name: "dontlognull"})
@@ -614,9 +610,7 @@ func (p *configParser) getBackendParser() *Parsers {
614610
addParser(parser, &sequence, &simple.Option{Name: "http-server-close"})
615611
addParser(parser, &sequence, &simple.Option{Name: "http-keep-alive"})
616612
addParser(parser, &sequence, &simple.Option{Name: "http-pretend-keepalive"})
617-
addParser(parser, &sequence, &simple.Option{Name: "http-use-htx"})
618613
addParser(parser, &sequence, &simple.Option{Name: "http-no-delay"})
619-
addParser(parser, &sequence, &simple.Option{Name: "http-proxy"})
620614
addParser(parser, &sequence, &parsers.OptionForwardFor{})
621615
addParser(parser, &sequence, &simple.Option{Name: "ssl-hello-chk"})
622616
addParser(parser, &sequence, &parsers.OptionSmtpchk{})
@@ -754,9 +748,7 @@ func (p *configParser) getListenParser() *Parsers {
754748
addParser(parser, &sequence, &simple.Option{Name: "http-server-close"})
755749
addParser(parser, &sequence, &simple.Option{Name: "http-keep-alive"})
756750
addParser(parser, &sequence, &simple.Option{Name: "http-pretend-keepalive"})
757-
addParser(parser, &sequence, &simple.Option{Name: "http-use-htx"})
758751
addParser(parser, &sequence, &simple.Option{Name: "http-no-delay"})
759-
addParser(parser, &sequence, &simple.Option{Name: "http-proxy"})
760752
addParser(parser, &sequence, &parsers.OptionForwardFor{})
761753
addParser(parser, &sequence, &simple.Option{Name: "ssl-hello-chk"})
762754
addParser(parser, &sequence, &parsers.OptionSmtpchk{})

models/backend_base.go

Lines changed: 0 additions & 108 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/backendbase_diff_generated.go

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

models/backendbase_equal_generated.go

Lines changed: 0 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: 0 additions & 51 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/defaultsbase_diff_generated.go

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

models/defaultsbase_equal_generated.go

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

0 commit comments

Comments
 (0)