From b21491684ad1c82040f199b65ebbca865a6cf830 Mon Sep 17 00:00:00 2001
From: guscarreon <guscarreon@gmail.com>
Date: Thu, 2 May 2024 14:46:17 -0400
Subject: [PATCH] Rolled back max header size cap

---
 config/config.go      | 4 ++--
 config/config_test.go | 2 +-
 server/server.go      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/config.go b/config/config.go
index ebf926fc..18f41dd5 100644
--- a/config/config.go
+++ b/config/config.go
@@ -205,10 +205,10 @@ func (cfg *RequestLimits) validateAndLog() {
 		log.Fatalf("invalid config.request_limits.max_num_values: %d. Value cannot be negative.", cfg.MaxNumValues)
 	}
 
-	if cfg.MaxHeaderSize >= 0 && cfg.MaxHeaderSize <= http.DefaultMaxHeaderBytes {
+	if cfg.MaxHeaderSize >= 0 {
 		log.Infof("config.request_limits.max_header_size_bytes: %d", cfg.MaxHeaderSize)
 	} else {
-		log.Fatalf("invalid config.request_limits.max_header_size_bytes: %d. Value out of range.", cfg.MaxHeaderSize)
+		log.Fatalf("invalid config.request_limits.max_header_size_bytes: %d. Value cannot be negative.", cfg.MaxHeaderSize)
 	}
 }
 
diff --git a/config/config_test.go b/config/config_test.go
index b4ff9b70..1c12cdb1 100644
--- a/config/config_test.go
+++ b/config/config_test.go
@@ -875,7 +875,7 @@ func TestRequestLimitsValidateAndLog(t *testing.T) {
 				{msg: `config.request_limits.max_ttl_seconds: 0`, lvl: logrus.InfoLevel},
 				{msg: `config.request_limits.max_size_bytes: 0`, lvl: logrus.InfoLevel},
 				{msg: `config.request_limits.max_num_values: 0`, lvl: logrus.InfoLevel},
-				{msg: `invalid config.request_limits.max_header_size_bytes: -1. Value out of range.`, lvl: logrus.FatalLevel},
+				{msg: `invalid config.request_limits.max_header_size_bytes: -1. Value cannot be negative.`, lvl: logrus.FatalLevel},
 			},
 			expectFatal: true,
 		},
diff --git a/server/server.go b/server/server.go
index 1d68d18b..6f103e2c 100644
--- a/server/server.go
+++ b/server/server.go
@@ -83,7 +83,7 @@ func newAdminServer(cfg config.Configuration, handler http.Handler) *http.Server
 		Addr:    ":" + strconv.Itoa(cfg.AdminPort),
 		Handler: handler,
 	}
-	if cfg.RequestLimits.MaxHeaderSize > 0 && cfg.RequestLimits.MaxHeaderSize < http.DefaultMaxHeaderBytes {
+	if cfg.RequestLimits.MaxHeaderSize > 0 {
 		server.MaxHeaderBytes = cfg.RequestLimits.MaxHeaderSize
 	}
 	return server