From 202c920064b3df9502848d9c914b26517e857f40 Mon Sep 17 00:00:00 2001
From: bati11 <mail.bati11@gmail.com>
Date: Sun, 2 Feb 2014 02:47:09 +0900
Subject: [PATCH] Fix #257, "org.scalatra.ForceHttps" set to true, if
 --https=true

ScalatraBase.redirect() use "org.scalatra.ForceHttps" in servlet
context init parameter when choice 'http' or 'https'.
---
 src/main/java/JettyLauncher.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/JettyLauncher.java b/src/main/java/JettyLauncher.java
index a644f1fa6..d7b137d6f 100644
--- a/src/main/java/JettyLauncher.java
+++ b/src/main/java/JettyLauncher.java
@@ -53,6 +53,9 @@ public class JettyLauncher {
         context.setDescriptor(location.toExternalForm() + "/WEB-INF/web.xml");
         context.setServer(server);
         context.setWar(location.toExternalForm());
+        if (forceHttps) {
+            context.setInitParameter("org.scalatra.ForceHttps", "true");
+        }
 
         server.setHandler(context);
         server.start();