[ZEPPELIN-5018] Small http config refactoring
### What is this PR for?
This PR includes:
- Configure RequestHeaderSize directly without cast afterwards
- Removing the setting of the default values, because it confuses
- SecureRequestCustomizer does not need to be stored in an additional variable
### What type of PR is it?
Refactoring
### Todos
* [ ] - Task
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-5018
### How should this be tested?
* **Travis-CI**: https://travis-ci.org/github/Reamer/zeppelin/builds/721255684
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: Philipp Dallig <philipp.dallig@gmail.com>
Closes #3888 from Reamer/small_httpConfig_cleanup and squashes the following commits:
8384a65c2 [Philipp Dallig] SecureRequestCustomizer does not need to be stored in an additional variable
77b6ff4ab [Philipp Dallig] Removing the setting of the default values, because it confuses
6b456d620 [Philipp Dallig] Configure RequestHeaderSize directly without cast
diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java b/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java
index 6c30c34..f1224c1 100644
--- a/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java
+++ b/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java
@@ -325,16 +325,14 @@
HttpConfiguration httpConfig = new HttpConfiguration();
httpConfig.addCustomizer(new ForwardedRequestCustomizer());
httpConfig.setSendServerVersion(conf.sendJettyName());
+ httpConfig.setRequestHeaderSize(conf.getJettyRequestHeaderSize());
if (conf.useSsl()) {
LOG.debug("Enabling SSL for Zeppelin Server on port {}", sslPort);
httpConfig.setSecureScheme("https");
httpConfig.setSecurePort(sslPort);
- httpConfig.setOutputBufferSize(32768);
- httpConfig.setResponseHeaderSize(8192);
HttpConfiguration httpsConfig = new HttpConfiguration(httpConfig);
- SecureRequestCustomizer src = new SecureRequestCustomizer();
- httpsConfig.addCustomizer(src);
+ httpsConfig.addCustomizer(new SecureRequestCustomizer());
connector =
new ServerConnector(
@@ -346,7 +344,6 @@
connector = new ServerConnector(server, new HttpConnectionFactory(httpConfig));
connector.setPort(port);
}
- configureRequestHeaderSize(conf, connector);
// Set some timeout options to make debugging easier.
int timeout = 1000 * 30;
connector.setIdleTimeout(timeout);
@@ -395,14 +392,6 @@
}
}
- private static void configureRequestHeaderSize(
- ZeppelinConfiguration conf, ServerConnector connector) {
- HttpConnectionFactory cf =
- (HttpConnectionFactory) connector.getConnectionFactory(HttpVersion.HTTP_1_1.toString());
- int requestHeaderSize = conf.getJettyRequestHeaderSize();
- cf.getHttpConfiguration().setRequestHeaderSize(requestHeaderSize);
- }
-
private static void setupNotebookServer(
WebAppContext webapp, ZeppelinConfiguration conf, ServiceLocator serviceLocator) {
String maxTextMessageSize = conf.getWebsocketMaxTextMessageSize();