Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS
Mirrored from https://github.com/Slazee/caddy.git
Synced Nov 12, 13:15 UTC
reverseproxy: Remove long-deprecated buffering properties
They've been deprecated for over a year and we printed warnings during that time.
Matthew Holt committed
Apr 22, 2024 at 15:34 UTC
9f97df2275638ef80ca104dd0ca51e5a7ab93b21
2 files changed
-47
modules/caddyhttp/reverseproxy/caddyfile.go
-27
@@ -607,33 +607,6 @@ func (h *Handler) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
607
h.ResponseBuffers = size
608
}
609
610
- // TODO: These three properties are deprecated; remove them sometime after v2.6.4
611
- case "buffer_requests": // TODO: deprecated
612
- if d.NextArg() {
613
- return d.ArgErr()
614
- }
615
- caddy.Log().Named("config.adapter.caddyfile").Warn("DEPRECATED: buffer_requests: use request_buffers instead (with a maximum buffer size)")
616
- h.DeprecatedBufferRequests = true
617
- case "buffer_responses": // TODO: deprecated
618
- if d.NextArg() {
619
- return d.ArgErr()
620
- }
621
- caddy.Log().Named("config.adapter.caddyfile").Warn("DEPRECATED: buffer_responses: use response_buffers instead (with a maximum buffer size)")
622
- h.DeprecatedBufferResponses = true
623
- case "max_buffer_size": // TODO: deprecated
624
- if !d.NextArg() {
625
- return d.ArgErr()
626
- }
627
- size, err := humanize.ParseBytes(d.Val())
628
- if err != nil {
629
- return d.Errf("invalid byte size '%s': %v", d.Val(), err)
630
- }
631
- if d.NextArg() {
632
- return d.ArgErr()
633
- }
634
- caddy.Log().Named("config.adapter.caddyfile").Warn("DEPRECATED: max_buffer_size: use request_buffers and/or response_buffers instead (with maximum buffer sizes)")
635
- h.DeprecatedMaxBufferSize = int64(size)
636
-
610
case "stream_timeout":
611
if !d.NextArg() {
612
return d.ArgErr()
modules/caddyhttp/reverseproxy/reverseproxy.go
-20
@@ -129,15 +129,6 @@ type Handler struct {
129
// are also set implicitly.
130
Headers *headers.Handler `json:"headers,omitempty"`
131
132
- // DEPRECATED: Do not use; will be removed. See request_buffers instead.
133
- DeprecatedBufferRequests bool `json:"buffer_requests,omitempty"`
134
-
135
- // DEPRECATED: Do not use; will be removed. See response_buffers instead.
136
- DeprecatedBufferResponses bool `json:"buffer_responses,omitempty"`
137
-
138
- // DEPRECATED: Do not use; will be removed. See request_buffers and response_buffers instead.
139
- DeprecatedMaxBufferSize int64 `json:"max_buffer_size,omitempty"`
140
-
132
// If nonzero, the entire request body up to this size will be read
133
// and buffered in memory before being proxied to the backend. This
134
// should be avoided if at all possible for performance reasons, but
@@ -241,17 +232,6 @@ func (h *Handler) Provision(ctx caddy.Context) error {
232
h.connections = make(map[io.ReadWriteCloser]openConnection)
233
h.connectionsMu = new(sync.Mutex)
234
244
- // TODO: remove deprecated fields sometime after v2.6.4
245
- if h.DeprecatedBufferRequests {
246
- h.logger.Warn("DEPRECATED: buffer_requests: this property will be removed soon; use request_buffers instead (and set a maximum buffer size)")
247
- }
248
- if h.DeprecatedBufferResponses {
249
- h.logger.Warn("DEPRECATED: buffer_responses: this property will be removed soon; use response_buffers instead (and set a maximum buffer size)")
250
- }
251
- if h.DeprecatedMaxBufferSize != 0 {
252
- h.logger.Warn("DEPRECATED: max_buffer_size: this property will be removed soon; use request_buffers and/or response_buffers instead (and set maximum buffer sizes)")
253
- }
254
-
235
// warn about unsafe buffering config
236
if h.RequestBuffers == -1 || h.ResponseBuffers == -1 {
237
h.logger.Warn("UNLIMITED BUFFERING: buffering is enabled without any cap on buffer size, which can result in OOM crashes")