diff options
author | HÃ¥kon Hallingstad <hakon.hallingstad@gmail.com> | 2024-04-03 17:47:05 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-03 17:47:05 +0200 |
commit | 74249832ba16be3605836ee1fd6693d90e3995fd (patch) | |
tree | 4c6b550b7d35cca4b95485cf23a007aa6bc41caf /container-core/src/main | |
parent | f57333f6f657518f82246a08bafdb659c1fc68db (diff) | |
parent | ac4739427c0959e6f2f022c98cc4ba10e05cf2a4 (diff) |
Merge pull request #30805 from vespa-engine/revert-30804-revert-30797-hakonhall/disable-proxy-protocol-on-jdisc-containers-in-azure-2v8.326.37
Revert "Revert "Disable proxy protocol on jdisc containers in Azure, #2""
Diffstat (limited to 'container-core/src/main')
-rw-r--r-- | container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.connector.def | 2 |
1 files changed, 2 insertions, 0 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 95b93617b6f..2906f75a1f5 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 @@ -123,6 +123,8 @@ healthCheckProxy.cacheExpiry double default=1.0 proxyProtocol.enabled bool default=false # Allow https in parallel with proxy protocol +# TODO Vespa 9 Remove +# Unused since 8.327 proxyProtocol.mixedMode bool default=false # Maximum number of request per connection before server marks connections as non-persistent. Set to '0' to disable. |