diff --git a/config.h b/config.h index cbea12a..5ca9965 100644 --- a/config.h +++ b/config.h @@ -174,7 +174,7 @@ #define STDC_HEADERS 1 /* Most recent revision number in the version control system */ -#define VCS_REVISION "238" +#define VCS_REVISION "239" /* Version number of package */ #define VERSION "2.10" diff --git a/configure b/configure index b449c85..03771da 100755 --- a/configure +++ b/configure @@ -2328,7 +2328,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -VCS_REVISION=238 +VCS_REVISION=239 cat >>confdefs.h <<_ACEOF diff --git a/configure.ac b/configure.ac index b8d05bb..c4a4d55 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=238 +VCS_REVISION=239 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 f76687c..ddbdd7e 100644 --- a/demo/vt100.js +++ b/demo/vt100.js @@ -2402,7 +2402,7 @@ VT100.prototype.toggleCursorBlinking = function() { }; VT100.prototype.about = function() { - alert("VT100 Terminal Emulator " + "2.10 (revision 238)" + + alert("VT100 Terminal Emulator " + "2.10 (revision 239)" + "\nCopyright 2008-2010 by Markus Gutschke\n" + "For more information check http://shellinabox.com"); }; diff --git a/libhttp/server.c b/libhttp/server.c index 58ef949..51c0e60 100644 --- a/libhttp/server.c +++ b/libhttp/server.c @@ -583,12 +583,15 @@ void serverLoop(struct Server *server) { if (server->pollFds[i].revents) { eventCount--; } + short events = server->pollFds[i].events; + short oldEvents = events; if (!connection->handleConnection(connection, connection->arg, - &server->pollFds[i].events, - server->pollFds[i].revents)) { + &events, server->pollFds[i].revents)){ connection = server->connections + i - 1; connection->destroyConnection(connection->arg); connection->deleted = 1; + } else if (events != oldEvents) { + server->pollFds[i].events = events; } } } diff --git a/shellinabox/shell_in_a_box.js b/shellinabox/shell_in_a_box.js index 244384e..294a914 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 238)" + + alert("Shell In A Box version " + "2.10 (revision 239)" + "\nCopyright 2008-2010 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 f76687c..ddbdd7e 100644 --- a/shellinabox/vt100.js +++ b/shellinabox/vt100.js @@ -2402,7 +2402,7 @@ VT100.prototype.toggleCursorBlinking = function() { }; VT100.prototype.about = function() { - alert("VT100 Terminal Emulator " + "2.10 (revision 238)" + + alert("VT100 Terminal Emulator " + "2.10 (revision 239)" + "\nCopyright 2008-2010 by Markus Gutschke\n" + "For more information check http://shellinabox.com"); };