- 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.

diff --git a/config.h b/config.h
index b70ebf6fc9bcb5fbee2658145dc5ce8e27f82019..a8f03a6cda5305563f8b1c36723d67c52eca8921 100644 (file)
--- 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 b95d2e810e692f947f04a3a404765f4d72b8e142..3b0e1afb0212cff75efb00a24f904ba7f8a756c7 100755 (executable)
--- 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 4c85c7c2739c40d0d8ef351c7f4ccd4cc5a7eca1..6bba2accb2b2e1e231b30a66d8c26d154035c50b 100644 (file)
--- 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 1884e8bf80a0a31878f8ab393fca69d210599f97..5c825b04c744f6c064f772df969e5fa4e54e643f 100644 (file)
--- 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 adb3342eda9ae0f8a5a02741f9c1b4f16613018e..2711438b06f8d0237ae1a0c8f8f54fa42b0cad74 100644 (file)
--- 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 a360a5df490f9cbc753bac722aad0fa11d0d360d..372f6352c4f33ab676d9e04b4236f0144c9c99af 100644 (file)
--- 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 1884e8bf80a0a31878f8ab393fca69d210599f97..5c825b04c744f6c064f772df969e5fa4e54e643f 100644 (file)
--- 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");
 };