summaryrefslogtreecommitdiffstats
path: root/container-core/src/main/resources
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@yahooinc.com>2022-10-17 13:10:58 +0200
committerBjørn Christian Seime <bjorncs@yahooinc.com>2023-01-13 16:30:46 +0100
commit01169449674de150ba27dab916e24ede6559848b (patch)
treeb834253f5c64bf32d433ae99bebeca580f94795f /container-core/src/main/resources
parent6ea555de57ad11bae44e7f9abca4d2b06d3863ae (diff)
Upgrade Jetty from 9.4.49 to 11.0.13
Diffstat (limited to 'container-core/src/main/resources')
-rw-r--r--container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.connector.def3
-rw-r--r--container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.server.def3
2 files changed, 4 insertions, 2 deletions
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 ecbc451ead1..bdcc3f9e40a 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,7 +28,8 @@ reuseAddress bool default=true
# The maximum idle time for a connection, which roughly translates to the Socket.setSoTimeout(int).
idleTimeout double default=180.0
-# Whether or not to have socket keep alive turned on.
+# TODO Vespa 9 Remove
+# Has no effect since Jetty 11 upgrade
tcpKeepAliveEnabled bool default=false
# Enable/disable TCP_NODELAY (disable/enable Nagle's algorithm).
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 f34fd523207..c15cb6b2cc4 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
@@ -4,7 +4,8 @@ namespace=jdisc.http
# Whether to enable developer mode, where stack traces etc are visible in response bodies.
developerMode bool default=false
-# The gzip compression level to use, if compression is enabled in a request.
+# TODO Vespa 9 Remove
+# Has no effect since Jetty 11 upgrade
responseCompressionLevel int default=6
# Whether the request body of POSTed forms should be removed (form parameters are available as request parameters).