Merge branch 'master' into rpc

James Moger

2011-10-07 55cecdbb6c961441330c928f9ed587582f317f4b

 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(true);

         connector.setAllowRenegotiate(allowRenegotiation);

      }		
      connector.setKeystore(keystore.getAbsolutePath());

      connector.setPassword(password);

      connector.setPort(port);