Remove unused parameters from http config definitions

3 files changed, 0 insertions, 21 deletions

diff --git a/container-core/abi-spec.json b/container-core/abi-spec.json
index 2230246950c..b476a99ed4b 100644
--- a/container-core/abi-spec.json
+++ b/container-core/abi-spec.json
@@ -1057,7 +1057,6 @@
       "public com.yahoo.jdisc.http.ConnectorConfig$Builder acceptQueueSize(int)",
       "public com.yahoo.jdisc.http.ConnectorConfig$Builder reuseAddress(boolean)",
       "public com.yahoo.jdisc.http.ConnectorConfig$Builder idleTimeout(double)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Builder stopTimeout(double)",
       "public com.yahoo.jdisc.http.ConnectorConfig$Builder tcpKeepAliveEnabled(boolean)",
       "public com.yahoo.jdisc.http.ConnectorConfig$Builder tcpNoDelay(boolean)",
       "public com.yahoo.jdisc.http.ConnectorConfig$Builder throttling(com.yahoo.jdisc.http.ConnectorConfig$Throttling$Builder)",
@@ -1420,7 +1419,6 @@
       "public int acceptQueueSize()",
       "public boolean reuseAddress()",
       "public double idleTimeout()",
-      "public double stopTimeout()",
       "public boolean tcpKeepAliveEnabled()",
       "public boolean tcpNoDelay()",
       "public com.yahoo.jdisc.http.ConnectorConfig$Throttling throttling()",
@@ -1832,8 +1830,6 @@
       "public void <init>(com.yahoo.jdisc.http.ServerConfig)",
       "public com.yahoo.jdisc.http.ServerConfig$Builder developerMode(boolean)",
       "public com.yahoo.jdisc.http.ServerConfig$Builder responseCompressionLevel(int)",
-      "public com.yahoo.jdisc.http.ServerConfig$Builder httpKeepAliveEnabled(boolean)",
-      "public com.yahoo.jdisc.http.ServerConfig$Builder maxKeepAliveRequests(int)",
       "public com.yahoo.jdisc.http.ServerConfig$Builder removeRawPostBodyForWwwUrlEncodedPost(boolean)",
       "public com.yahoo.jdisc.http.ServerConfig$Builder filter(com.yahoo.jdisc.http.ServerConfig$Filter$Builder)",
       "public com.yahoo.jdisc.http.ServerConfig$Builder filter(java.util.function.Consumer)",
@@ -2065,8 +2061,6 @@
       "public void <init>(com.yahoo.jdisc.http.ServerConfig$Builder)",
       "public boolean developerMode()",
       "public int responseCompressionLevel()",
-      "public boolean httpKeepAliveEnabled()",
-      "public int maxKeepAliveRequests()",
       "public boolean removeRawPostBodyForWwwUrlEncodedPost()",
       "public java.util.List filter()",
       "public com.yahoo.jdisc.http.ServerConfig$Filter filter(int)",
diff --git a/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.connector.def b/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.connector.def
index b4bd624c22f..ca02c245015 100644
--- a/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.connector.def
+++ b/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.connector.def
@@ -28,10 +28,6 @@ reuseAddress                        bool     default=true
 # The maximum idle time for a connection, which roughly translates to the Socket.setSoTimeout(int).
 idleTimeout                         double   default=180.0
 
-# DEPRECATED - Ignored, no longer in use
-stopTimeout                           double default = 30.0
-# TODO Vespa 8 Remove stop timeout
-
 # Whether or not to have socket keep alive turned on.
 tcpKeepAliveEnabled                 bool     default=false
 
diff --git a/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.server.def b/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.server.def
index aed92b1459f..f34fd523207 100644
--- a/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.server.def
+++ b/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.server.def
@@ -7,17 +7,6 @@ developerMode                         bool   default=false
 # The gzip compression level to use, if compression is enabled in a request.
 responseCompressionLevel              int    default=6
 
-# DEPRECATED - Ignored, no longer in use.
-httpKeepAliveEnabled                  bool   default=true
-# TODO Vespa 8 Remove httpKeepAliveEnabled
-
-# Maximum number of request per http connection before server will hangup.
-# Naming taken from apache http server.
-# 0 means never hangup.
-# DEPRECATED - Ignored, no longer in use. Use similar parameter in connector config instead.
-maxKeepAliveRequests                  int    default=0
-# TODO Vespa 8 Remove maxKeepAliveRequests
-
 # Whether the request body of POSTed forms should be removed (form parameters are available as request parameters).
 removeRawPostBodyForWwwUrlEncodedPost bool   default=false