From f2806358a5794ccc461de5e3c3019948462c7cc8 Mon Sep 17 00:00:00 2001 From: James Moger Date: Fri, 7 Oct 2011 20:49:32 -0400 Subject: [PATCH] Fix SSL allow renegotiation take 2. --- src/com/gitblit/GitBlitServer.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/gitblit/GitBlitServer.java b/src/com/gitblit/GitBlitServer.java index 204ae4d9..5c8c5fe4 100644 --- a/src/com/gitblit/GitBlitServer.java +++ b/src/com/gitblit/GitBlitServer.java @@ -147,7 +147,7 @@ public class GitBlitServer { Connector httpConnector = createConnector(params.useNIO, params.port); String bindInterface = settings.getString(Keys.server.httpBindInterface, null); if (!StringUtils.isEmpty(bindInterface)) { - logger.warn(MessageFormat.format("Binding connector on port {0} to {1}", + logger.warn(MessageFormat.format("Binding connector on port {0,number,0} to {1}", params.port, bindInterface)); httpConnector.setHost(bindInterface); } @@ -170,7 +170,7 @@ public class GitBlitServer { params.useNIO, params.securePort); String bindInterface = settings.getString(Keys.server.httpsBindInterface, null); if (!StringUtils.isEmpty(bindInterface)) { - logger.warn(MessageFormat.format("Binding ssl connector on port {0} to {1}", + logger.warn(MessageFormat.format("Binding ssl connector on port {0,number,0} to {1}", params.securePort, bindInterface)); secureConnector.setHost(bindInterface); } @@ -327,8 +327,8 @@ public class GitBlitServer { } if (allowRenegotiation) { logger.info(" allowing SSL renegotiation on Java " + v); - } - connector.setAllowRenegotiate(true); + connector.setAllowRenegotiate(allowRenegotiation); + } connector.setKeystore(keystore.getAbsolutePath()); connector.setPassword(password); connector.setPort(port); -- 2.39.5