From 2d226f5b539bae0adffe26b15508cef9a47115f9 Mon Sep 17 00:00:00 2001
From: zodiac <zodiac@0da03de8-d603-11dd-86c2-0f8696b7b6f9>
Date: Sat, 8 Aug 2009 22:49:31 +0000
Subject: [PATCH] Removed incorrectly added duplicate HTML header from root
 HTML page.

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

diff --git a/config.h b/config.h
index 1054a4b..072a9cd 100644
--- 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 00b1235..324bdc4 100755
--- 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 78223d6..85960c9 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=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 2bd4027..dacb710 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 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 03b02e3..e3acb7a 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 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 ef1af94..e5628bb 100644
--- 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 2bd4027..dacb710 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 162)" +
+  alert("VT100 Terminal Emulator " + "2.9 (revision 163)" +
         "\nCopyright 2008-2009 by Markus Gutschke\n" +
         "For more information check http://shellinabox.com");
 };