From 218d9011316b58ae97aa282ca410904955c6d3fd Mon Sep 17 00:00:00 2001
From: "zodiac@gmail.com"
 <zodiac@gmail.com@0da03de8-d603-11dd-86c2-0f8696b7b6f9>
Date: Mon, 27 Jul 2009 20:09:33 +0000
Subject: [PATCH] - Perform all URL rewriting before loading the first resource
 (e.g. style sheets). - Allow reverse proxies to do their own SSL encryption
 even if ShellInABox explicitly disabled encryption.

git-svn-id: https://shellinabox.googlecode.com/svn/trunk@153 0da03de8-d603-11dd-86c2-0f8696b7b6f9
---
 config.h                      | 2 +-
 configure                     | 2 +-
 configure.ac                  | 2 +-
 demo/vt100.js                 | 2 +-
 shellinabox/root_page.html    | 6 ++++--
 shellinabox/shell_in_a_box.js | 2 +-
 shellinabox/vt100.js          | 2 +-
 7 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/config.h b/config.h
index b70ebf6..a8f03a6 100644
--- a/config.h
+++ b/config.h
@@ -135,7 +135,7 @@
 #define STDC_HEADERS 1
 
 /* Most recent revision number in the version control system */
-#define VCS_REVISION "152"
+#define VCS_REVISION "153"
 
 /* Version number of package */
 #define VERSION "2.9"
diff --git a/configure b/configure
index b95d2e8..3b0e1af 100755
--- a/configure
+++ b/configure
@@ -2037,7 +2037,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-VCS_REVISION=152
+VCS_REVISION=153
 
 
 cat >>confdefs.h <<_ACEOF
diff --git a/configure.ac b/configure.ac
index 4c85c7c..6bba2ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ(2.57)
 
 dnl This is the one location where the authoritative version number is stored
 AC_INIT(shellinabox, 2.9, markus@shellinabox.com)
-VCS_REVISION=152
+VCS_REVISION=153
 AC_SUBST(VCS_REVISION)
 AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}",
                    [Most recent revision number in the version control system])
diff --git a/demo/vt100.js b/demo/vt100.js
index 1884e8b..5c825b0 100644
--- a/demo/vt100.js
+++ b/demo/vt100.js
@@ -1693,7 +1693,7 @@ VT100.prototype.toggleBell = function() {
 };
 
 VT100.prototype.about = function() {
-  alert("VT100 Terminal Emulator " + "2.9 (revision 152)" +
+  alert("VT100 Terminal Emulator " + "2.9 (revision 153)" +
         "\nCopyright 2008-2009 by Markus Gutschke\n" +
         "For more information check http://shellinabox.com");
 };
diff --git a/shellinabox/root_page.html b/shellinabox/root_page.html
index adb3342..2711438 100644
--- a/shellinabox/root_page.html
+++ b/shellinabox/root_page.html
@@ -48,14 +48,13 @@
     http://shellinabox.com
     -->
     <title>Shell In A Box</title>
-    <link rel="stylesheet" href="styles.css" type="text/css">
     <script type="text/javascript"><!--
       // Check that our URL is well-formed. Redirect to HTTPS if necessary
       (function() {
         var hasSSL = %s;
         var path   = document.location.pathname;
         var proto  = hasSSL ? 'https:' : 'http:';
-        if (path.match(/plain/) || !hasSSL) {
+        if (path.match(/plain/)) {
           proto   = 'http:';
         }
         path      = path.replace(/\/+/, '/').replace(/\/$/, '');
@@ -75,6 +74,9 @@
           document.location.replace(url);
         }
       })();
+    --></script>
+    <link rel="stylesheet" href="styles.css" type="text/css">
+    <script type="text/javascript"><!--
 
       // We would like to hide overflowing lines as this can lead to
       // visually jarring results if the browser substitutes oversized
diff --git a/shellinabox/shell_in_a_box.js b/shellinabox/shell_in_a_box.js
index a360a5d..372f635 100644
--- a/shellinabox/shell_in_a_box.js
+++ b/shellinabox/shell_in_a_box.js
@@ -355,7 +355,7 @@ ShellInABox.prototype.extendContextMenu = function(entries, actions) {
 };
 
 ShellInABox.prototype.about = function() {
-  alert("Shell In A Box version " + "2.9 (revision 152)" +
+  alert("Shell In A Box version " + "2.9 (revision 153)" +
         "\nCopyright 2008-2009 by Markus Gutschke\n" +
         "For more information check http://shellinabox.com" +
         (typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ?
diff --git a/shellinabox/vt100.js b/shellinabox/vt100.js
index 1884e8b..5c825b0 100644
--- a/shellinabox/vt100.js
+++ b/shellinabox/vt100.js
@@ -1693,7 +1693,7 @@ VT100.prototype.toggleBell = function() {
 };
 
 VT100.prototype.about = function() {
-  alert("VT100 Terminal Emulator " + "2.9 (revision 152)" +
+  alert("VT100 Terminal Emulator " + "2.9 (revision 153)" +
         "\nCopyright 2008-2009 by Markus Gutschke\n" +
         "For more information check http://shellinabox.com");
 };