diff --git a/config.h b/config.h index e517fa7..1fe2831 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 "186" +#define VCS_REVISION "187" /* Version number of package */ #define VERSION "2.10" diff --git a/configure b/configure index 6a54256..3dfd081 100755 --- a/configure +++ b/configure @@ -2319,7 +2319,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -VCS_REVISION=186 +VCS_REVISION=187 cat >>confdefs.h <<_ACEOF diff --git a/configure.ac b/configure.ac index 676023e..11226d6 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.10, markus@shellinabox.com) -VCS_REVISION=186 +VCS_REVISION=187 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 cf7a5de..23cb4ed 100644 --- a/demo/vt100.js +++ b/demo/vt100.js @@ -1901,7 +1901,7 @@ VT100.prototype.toggleBell = function() { }; VT100.prototype.about = function() { - alert("VT100 Terminal Emulator " + "2.10 (revision 186)" + + alert("VT100 Terminal Emulator " + "2.10 (revision 187)" + "\nCopyright 2008-2009 by Markus Gutschke\n" + "For more information check http://shellinabox.com"); }; diff --git a/libhttp/ssl.c b/libhttp/ssl.c index 2421c4a..3c3df21 100644 --- a/libhttp/ssl.c +++ b/libhttp/ssl.c @@ -610,7 +610,7 @@ static int sslSNICallback(SSL *sslHndl, int *al, struct SSLSupport *ssl) { } #endif -#if defined(HAVE_OPENSSL) && 1 +#if defined(HAVE_OPENSSL) // This is a not-thread-safe replacement for gethostbyname_r() #define gethostbyname_r x_gethostbyname_r static int gethostbyname_r(const char *name, struct hostent *ret, diff --git a/shellinabox/shell_in_a_box.js b/shellinabox/shell_in_a_box.js index e0c5929..ca5904e 100644 --- a/shellinabox/shell_in_a_box.js +++ b/shellinabox/shell_in_a_box.js @@ -358,7 +358,7 @@ ShellInABox.prototype.extendContextMenu = function(entries, actions) { }; ShellInABox.prototype.about = function() { - alert("Shell In A Box version " + "2.10 (revision 186)" + + alert("Shell In A Box version " + "2.10 (revision 187)" + "\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 cf7a5de..23cb4ed 100644 --- a/shellinabox/vt100.js +++ b/shellinabox/vt100.js @@ -1901,7 +1901,7 @@ VT100.prototype.toggleBell = function() { }; VT100.prototype.about = function() { - alert("VT100 Terminal Emulator " + "2.10 (revision 186)" + + alert("VT100 Terminal Emulator " + "2.10 (revision 187)" + "\nCopyright 2008-2009 by Markus Gutschke\n" + "For more information check http://shellinabox.com"); };