diff options
author | Jon Bratseth <bratseth@yahoo-inc.com> | 2016-10-13 14:39:13 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2016-10-13 14:39:13 +0200 |
commit | e67d42c7da08db1cee7c3aaef563b96f3095a8a6 (patch) | |
tree | f537147c54b4a56cab0755d6556dfe9da7b6f3e0 /container-core | |
parent | e637f8d93c12b5f5efd58e16cb5e59aea6a6d423 (diff) |
Support configuring a hostname header
Diffstat (limited to 'container-core')
4 files changed, 9 insertions, 7 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/ExtendedResponse.java b/container-core/src/main/java/com/yahoo/container/jdisc/ExtendedResponse.java index adfb461c122..1aa69ba865f 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/ExtendedResponse.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/ExtendedResponse.java @@ -23,9 +23,8 @@ public abstract class ExtendedResponse extends AsyncHttpResponse { } @Override - public abstract void render(OutputStream output, - ContentChannel networkChannel, CompletionHandler handler) - throws IOException; + public abstract void render(OutputStream output, ContentChannel networkChannel, CompletionHandler handler) + throws IOException; /** * @return user name performing the request diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java index 205dbcd9ce8..6600a36f9db 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java @@ -34,12 +34,9 @@ public abstract class ThreadedHttpRequestHandler extends ThreadedRequestHandler public static final String DATE = "Date"; private static final String RENDERING_ERRORS = "rendering_errors"; - /** - * Logger for subclasses. - */ + /** Logger for subclasses */ protected final Logger log; - public ThreadedHttpRequestHandler(Executor executor) { this(executor, null); } diff --git a/container-core/src/main/resources/configdefinitions/container-http.def b/container-core/src/main/resources/configdefinitions/container-http.def index b3a1a8d7d41..ae0fecae549 100644 --- a/container-core/src/main/resources/configdefinitions/container-http.def +++ b/container-core/src/main/resources/configdefinitions/container-http.def @@ -8,6 +8,9 @@ enabled bool default=false ## Buffer size for incoming requests requestbuffersize int default=65536 +## If non-empty, handlers should emit a header containing this string as key and the local host name as value +hostResponseHeaderKey string default="" + ## Which port to listen on for search queries port.search int default=8081 @@ -16,3 +19,4 @@ port.host string default="" ## Whether to serve files on the same port as search queries. fileserver.throughsearch bool default=true + diff --git a/container-core/src/main/resources/configdefinitions/qr-templates.def b/container-core/src/main/resources/configdefinitions/qr-templates.def index a1d5a4f36e0..5ba2a387b3b 100644 --- a/container-core/src/main/resources/configdefinitions/qr-templates.def +++ b/container-core/src/main/resources/configdefinitions/qr-templates.def @@ -1,4 +1,6 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Not used +# TODO: Remove on Vespa 7 version=8 namespace=container.core |