You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by al...@apache.org on 2020/04/23 06:39:39 UTC
[zeppelin] branch branch-0.9 updated: [ZEPPELIN-4766] Fix SSL
regression
This is an automated email from the ASF dual-hosted git repository.
alexott pushed a commit to branch branch-0.9
in repository https://gitbox.apache.org/repos/asf/zeppelin.git
The following commit(s) were added to refs/heads/branch-0.9 by this push:
new f775f5f [ZEPPELIN-4766] Fix SSL regression
f775f5f is described below
commit f775f5fa7f1c8e75c0f3957a8c778acd4d08e75c
Author: Philipp Dallig <ph...@gmail.com>
AuthorDate: Mon Apr 20 19:13:19 2020 +0200
[ZEPPELIN-4766] Fix SSL regression
### What is this PR for?
This PR fixes a small part of #3571, which introduced a SSL-connector regression.
The port definition of the SSL connector has been deleted.
https://github.com/apache/zeppelin/pull/3571/files#diff-3477d79f3012453f20c3727ec60338e9L337-L341
### What type of PR is it?
- Hot Fix
### Todos
* [ ] - Task
### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-4766
### How should this be tested?
* **Travis-CI:** https://travis-ci.org/github/Reamer/zeppelin/builds/677349664
### Screenshots (if appropriate)
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: Philipp Dallig <ph...@gmail.com>
Closes #3740 from Reamer/ssl_regression and squashes the following commits:
44125ce4a [Philipp Dallig] Fix SSL regression
(cherry picked from commit f577f1e257ef64bb951527e95e98c589c802bff3)
Signed-off-by: Alex Ott <al...@apache.org>
---
.../src/main/java/org/apache/zeppelin/server/ZeppelinServer.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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 94ffca0..e7c8d84 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
@@ -312,7 +312,7 @@ public class ZeppelinServer extends ResourceConfig {
HttpConfiguration httpConfig = new HttpConfiguration();
httpConfig.addCustomizer(new ForwardedRequestCustomizer());
if (conf.useSsl()) {
- LOG.debug("Enabling SSL for Zeppelin Server on port " + sslPort);
+ LOG.debug("Enabling SSL for Zeppelin Server on port {}", sslPort);
httpConfig.setSecureScheme("https");
httpConfig.setSecurePort(sslPort);
httpConfig.setOutputBufferSize(32768);
@@ -328,6 +328,7 @@ public class ZeppelinServer extends ResourceConfig {
server,
new SslConnectionFactory(getSslContextFactory(conf), HttpVersion.HTTP_1_1.asString()),
new HttpConnectionFactory(httpsConfig));
+ connector.setPort(sslPort);
} else {
connector = new ServerConnector(server, new HttpConnectionFactory(httpConfig));
connector.setPort(port);