Fix SSL allow renegotiation take 2.

diff --git a/src/com/gitblit/GitBlitServer.java b/src/com/gitblit/GitBlitServer.java
index 204ae4d9dde339746fcf79d904ec231461f5202b..5c8c5fe4617ee27e1812a8be8265a45a9a1c3928 100644 (file)
--- 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);\r
                        String bindInterface = settings.getString(Keys.server.httpBindInterface, null);\r
                        if (!StringUtils.isEmpty(bindInterface)) {\r
-                               logger.warn(MessageFormat.format("Binding connector on port {0} to {1}",\r
+                               logger.warn(MessageFormat.format("Binding connector on port {0,number,0} to {1}",\r
                                                params.port, bindInterface));\r
                                httpConnector.setHost(bindInterface);\r
                        }\r
@@ -170,7 +170,7 @@ public class GitBlitServer {
                                                params.useNIO, params.securePort);\r
                                String bindInterface = settings.getString(Keys.server.httpsBindInterface, null);\r
                                if (!StringUtils.isEmpty(bindInterface)) {\r
-                                       logger.warn(MessageFormat.format("Binding ssl connector on port {0} to {1}",\r
+                                       logger.warn(MessageFormat.format("Binding ssl connector on port {0,number,0} to {1}",\r
                                                        params.securePort, bindInterface));\r
                                        secureConnector.setHost(bindInterface);\r
                                }\r
@@ -327,8 +327,8 @@ public class GitBlitServer {
                }\r
                if (allowRenegotiation) {\r
                        logger.info("   allowing SSL renegotiation on Java " + v);\r
-               }\r
-               connector.setAllowRenegotiate(true);\r
+                       connector.setAllowRenegotiate(allowRenegotiation);\r
+               }               \r
                connector.setKeystore(keystore.getAbsolutePath());\r
                connector.setPassword(password);\r
                connector.setPort(port);\r