Removed incorrectly added duplicate HTML header from root HTML page.

diff --git a/config.h b/config.h
index 1054a4b7e02ce3f17c6a717b12b4f8a6e406d72f..072a9cdaa8218eb7fec351fca8b3d6fa28f65a46 100644 (file)
--- a/config.h
+++ b/config.h
@@ -138,7 +138,7 @@
 #define STDC_HEADERS 1
 
 /* Most recent revision number in the version control system */
-#define VCS_REVISION "162"
+#define VCS_REVISION "163"
 
 /* Version number of package */
 #define VERSION "2.9"

diff --git a/configure b/configure
index 00b123581a34194525e48bb60bea0911494acb2b..324bdc48cac1cdb23821557dcee6bbe8f445d34a 100755 (executable)
--- a/configure
+++ b/configure
@@ -2317,7 +2317,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-VCS_REVISION=162
+VCS_REVISION=163
 
 
 cat >>confdefs.h <<_ACEOF

diff --git a/configure.ac b/configure.ac
index 78223d6a5830402813b76383b2977b00c53d38d9..85960c96c0de21e870a9eb3d4ba668c4ae253ac8 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=162
+VCS_REVISION=163
 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 2bd40276e49e12f7ad5e9930226813d831f1d8da..dacb710fc54ba4e79693d0f8fa9bbf9fa7840320 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 162)" +
+  alert("VT100 Terminal Emulator " + "2.9 (revision 163)" +
         "\nCopyright 2008-2009 by Markus Gutschke\n" +
         "For more information check http://shellinabox.com");
 };

diff --git a/shellinabox/shell_in_a_box.js b/shellinabox/shell_in_a_box.js
index 03b02e30e453127c5c08fd9fe92dc13cc2cf7b97..e3acb7ac3b2d8e371e21b8d57891f27f987b6071 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 162)" +
+  alert("Shell In A Box version " + "2.9 (revision 163)" +
         "\nCopyright 2008-2009 by Markus Gutschke\n" +
         "For more information check http://shellinabox.com" +
         (typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ?

diff --git a/shellinabox/shellinaboxd.c b/shellinabox/shellinaboxd.c
index ef1af94b7053918de61eec40ccfe7984840a67fe..e5628bb8fb68d19d111cb7e33dd45a5e36364fe0 100644 (file)
--- a/shellinabox/shellinaboxd.c
+++ b/shellinabox/shellinaboxd.c
@@ -497,7 +497,8 @@ static int shellInABoxHttpHandler(HttpConnection *http, void *arg,
     rootPage[rootPageEnd - rootPageStart] = '\000';
     char *html            = stringPrintf(NULL, rootPage,
                                          enableSSL ? "true" : "false");
-    httpSendReply(http, 200, "OK", html);
+    serveStaticFile(http, "text/html", html, strrchr(html, '\000'));
+    free(html);
     free(rootPage);
   } else if (pathInfoLength == 8 && !memcmp(pathInfo, "beep.wav", 8)) {
     // Serve the audio sample for the console bell.

diff --git a/shellinabox/vt100.js b/shellinabox/vt100.js
index 2bd40276e49e12f7ad5e9930226813d831f1d8da..dacb710fc54ba4e79693d0f8fa9bbf9fa7840320 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 162)" +
+  alert("VT100 Terminal Emulator " + "2.9 (revision 163)" +
         "\nCopyright 2008-2009 by Markus Gutschke\n" +
         "For more information check http://shellinabox.com");
 };