simono41/shellinabox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Perform all URL rewriting before loading the first resource (e.g. style sheets).

Browse source 
- 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
This commit is contained in:
zodiac@gmail.com 2009-07-27 20:09:33 +00:00
parent 052a47aa08
commit 218d901131
7 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config.h
View file

@ -135,7 +135,7 @@
#define STDC_HEADERS 1 #define STDC_HEADERS 1
/* Most recent revision number in the version control system */ /* Most recent revision number in the version control system */
#define VCS_REVISION "152" #define VCS_REVISION "153"
/* Version number of package */ /* Version number of package */
#define VERSION "2.9" #define VERSION "2.9"

2
configure vendored
View file

@ -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 ac_compiler_gnu=$ac_cv_c_compiler_gnu
VCS_REVISION=152 VCS_REVISION=153
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF

2
configure.ac
View file

@ -2,7 +2,7 @@ AC_PREREQ(2.57)
dnl This is the one location where the authoritative version number is stored dnl This is the one location where the authoritative version number is stored
AC_INIT(shellinabox, 2.9, markus@shellinabox.com) AC_INIT(shellinabox, 2.9, markus@shellinabox.com)
VCS_REVISION=152 VCS_REVISION=153
AC_SUBST(VCS_REVISION) AC_SUBST(VCS_REVISION)
AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}", AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}",
[Most recent revision number in the version control system]) [Most recent revision number in the version control system])

2
demo/vt100.js
View file

@ -1693,7 +1693,7 @@ VT100.prototype.toggleBell = function() {
}; };
VT100.prototype.about = 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" + "\nCopyright 2008-2009 by Markus Gutschke\n" +
"For more information check http://shellinabox.com"); "For more information check http://shellinabox.com");
}; };

6
shellinabox/root_page.html
View file

@ -48,14 +48,13 @@
http://shellinabox.com http://shellinabox.com
--> -->
<title>Shell In A Box</title> <title>Shell In A Box</title>
<link rel="stylesheet" href="styles.css" type="text/css">
<script type="text/javascript"><!-- <script type="text/javascript"><!--
// Check that our URL is well-formed. Redirect to HTTPS if necessary // Check that our URL is well-formed. Redirect to HTTPS if necessary
(function() { (function() {
var hasSSL = %s; var hasSSL = %s;
var path = document.location.pathname; var path = document.location.pathname;
var proto = hasSSL ? 'https:' : 'http:'; var proto = hasSSL ? 'https:' : 'http:';
if (path.match(/plain/) || !hasSSL) { if (path.match(/plain/)) {
proto = 'http:'; proto = 'http:';
} }
path = path.replace(/\/+/, '/').replace(/\/$/, ''); path = path.replace(/\/+/, '/').replace(/\/$/, '');
@ -75,6 +74,9 @@
document.location.replace(url); 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 // We would like to hide overflowing lines as this can lead to
// visually jarring results if the browser substitutes oversized // visually jarring results if the browser substitutes oversized

2
shellinabox/shell_in_a_box.js
View file

@ -355,7 +355,7 @@ ShellInABox.prototype.extendContextMenu = function(entries, actions) {
}; };
ShellInABox.prototype.about = function() { 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" + "\nCopyright 2008-2009 by Markus Gutschke\n" +
"For more information check http://shellinabox.com" + "For more information check http://shellinabox.com" +
(typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ? (typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ?

2
shellinabox/vt100.js
View file

@ -1693,7 +1693,7 @@ VT100.prototype.toggleBell = function() {
}; };
VT100.prototype.about = 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" + "\nCopyright 2008-2009 by Markus Gutschke\n" +
"For more information check http://shellinabox.com"); "For more information check http://shellinabox.com");
}; };