Removed compiler warning when building without SSL support.

diff --git a/config.h b/config.h
index e517fa735b23663e8de8a23ce510041d7cb8c8fb..1fe28311eaa6f44aa38f4124ce53c8fe8638d38e 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 "186"
+#define VCS_REVISION "187"
 
 /* Version number of package */
 #define VERSION "2.10"

diff --git a/configure b/configure
index 6a54256b7b992478eb6533ca223d7de37fa43793..3dfd081921601c8858492aac03543efb8cf5306c 100755 (executable)
--- 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 676023efb908cf0da6a411557d64754b3b91cb24..11226d666980efd147be86f0f62284d675fcaeec 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.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 cf7a5de352acc5caf5741b2e9e9da7e6742f197a..23cb4edd8151f4385960c9203ac4ab228e8485ac 100644 (file)
--- 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 2421c4a40ec91282afd287029859a166baed931c..3c3df21b2840c67fe002da9d77ca92ada2ad4064 100644 (file)
--- 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 e0c592990818a556b7e93311bdb71b7c8b4742ec..ca5904e78eda8f605b1ca14807a963873ef4db85 100644 (file)
--- 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 cf7a5de352acc5caf5741b2e9e9da7e6742f197a..23cb4edd8151f4385960c9203ac4ab228e8485ac 100644 (file)
--- 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");
 };