James Moger
2011-10-07 f2806358a5794ccc461de5e3c3019948462c7cc8
Fix SSL allow renegotiation take 2.
1 files modified
6 ■■■■ changed files
src/com/gitblit/GitBlitServer.java 6 ●●●● patch | view | raw | blame | history
src/com/gitblit/GitBlitServer.java
@@ -147,7 +147,7 @@
            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 @@
                        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 @@
        }
        if (allowRenegotiation) {
            logger.info("   allowing SSL renegotiation on Java " + v);
            connector.setAllowRenegotiate(allowRenegotiation);
        }
        connector.setAllowRenegotiate(true);
        connector.setKeystore(keystore.getAbsolutePath());
        connector.setPassword(password);
        connector.setPort(port);