Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-10-31 18:46:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Small fix for #170

Browse Source
This commit is contained in:
takezoe
2013-10-25 04:05:34 +09:00
parent 167a0f28b2
commit d1f0d01ae8
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.xml
View File

@@ -46,7 +46,7 @@
<zip destfile="${target.dir}/scala-${scala.version}/gitbucket_${scala.version}-${gitbucket.version}.war" <zip destfile="${target.dir}/scala-${scala.version}/gitbucket_${scala.version}-${gitbucket.version}.war"
basedir="${target.dir}/scala-${scala.version}/classes" basedir="${target.dir}/scala-${scala.version}/classes"
update = "true" update = "true"
includes="JettyLauncher.class,CustomConnector.class"/> includes="JettyLauncher.class,HttpsSupportConnector.class"/>
</target> </target>
<target name="rename" depends="embed"> <target name="rename" depends="embed">

12
src/main/java/JettyLauncher.java
View File

@@ -34,7 +34,7 @@ public class JettyLauncher {
Server server = new Server(); Server server = new Server();
CustomConnector connector = new CustomConnector(forceHttps); HttpsSupportConnector connector = new HttpsSupportConnector(forceHttps);
if(host != null) { if(host != null) {
connector.setHost(host); connector.setHost(host);
} }
@@ -58,16 +58,16 @@ public class JettyLauncher {
} }
} }
class CustomConnector extends SelectChannelConnector { class HttpsSupportConnector extends SelectChannelConnector {
boolean mForceHttps; private boolean forceHttps;
public CustomConnector(boolean forceHttps) { public HttpsSupportConnector(boolean forceHttps) {
mForceHttps = forceHttps; this.forceHttps = forceHttps;
} }
@Override @Override
public void customize(final EndPoint endpoint, final Request request) throws IOException { public void customize(final EndPoint endpoint, final Request request) throws IOException {
if (mForceHttps) { if (this.forceHttps) {
request.setScheme("https"); request.setScheme("https");
super.customize(endpoint, request); super.customize(endpoint, request);
} }