jsharmony 1.28.1 → 1.28.2

package/jsHarmonyServer.js

@@ -369,6 +369,7 @@ jsHarmonyServer.prototype.Run = function(cb){
     _this.servers.push(server);
     _this.addWebSocketHandler(server);
     server.timeout = _this.serverConfig.request_timeout;
+    if(server.timeout > 2*60*1000) server.keepAlive = true;
     _this.ListenPort(server, _this.serverConfig.http_port, _this.serverConfig.http_ip, function(){
       _this.jsh.Log.info(_this.jsh.Config.app_name + ' listening on HTTP port ' + server.address().port);
       _this.jsh.Log.info('Log in at '+_this.getURL());
@@ -395,6 +396,7 @@ jsHarmonyServer.prototype.Run = function(cb){
     _this.servers.push(server);
     _this.addWebSocketHandler(server);
     server.timeout = _this.serverConfig.request_timeout;
+    if(server.timeout > 2*60*1000) server.keepAlive = true;
     var new_http_port = 0;
     var new_https_port = 0;
 
@@ -438,6 +440,7 @@ jsHarmonyServer.prototype.Run = function(cb){
       var redirect_server = http.createServer(redirect_app);
       _this.servers.push(redirect_server);
       redirect_server.timeout = _this.serverConfig.request_timeout;
+      if(redirect_server.timeout > 2*60*1000) redirect_server.keepAlive = true;
       _this.ListenPort(redirect_server, _this.serverConfig.http_port, _this.serverConfig.http_ip, function(){
         new_http_port = redirect_server.address().port;
         start_https_server(cb,[redirect_server]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsharmony",
-  "version": "1.28.1",
+  "version": "1.28.2",
   "description": "Rapid Application Development (RAD) Platform for Node.js Database Application Development",
   "main": "index.js",
   "scripts": {

package/views/jsh_menu_horizontal.ejs

@@ -3,7 +3,7 @@
 var xmenu_headings = {};
 if(locals.menudata && menudata.MainMenu){
   %><div class="xmenu"><%
-    for(var i=0;i<menudata.MainMenu.length;i++){ menuitem = menudata.MainMenu[i];
+    for(var i=0;i<menudata.MainMenu.length;i++){ var menuitem = menudata.MainMenu[i];
       xmenu_headings[menuitem.ID] = menuitem.Title;
       %><a href="<%-menuitem.Link%>" onclick="<%-ejsext.escapeHTML(menuitem.OnClick?menuitem.OnClick+';return false;':'')%>" data-id="<%=menuitem.ID%>" class="xmenuitem xmenuitem_<%=ejsext.escapeCSSClass(menuitem.ID)%> <%-ejsext.iif(menuitem.Selected,'selected')%>"><%=menuitem.Title%><div class="bottom"></div></a><%
     }
@@ -17,7 +17,7 @@ if(locals.menudata && menudata.SubMenus){
     var parentname = '';
     if(parentid in xmenu_headings) parentname = xmenu_headings[parentid];
     %><div style="display:none;" class="xsubmenu xsubmenu_<%=ejsext.escapeCSSClass(parentid)%>" data-parent="<%=parentid%>"><div class="head"><%=parentname%>:</div><%
-    for(var i=0;i<submenu.length;i++){ menuitem = submenu[i];
+    for(var i=0;i<submenu.length;i++){ var menuitem = submenu[i];
       %><a href="<%-menuitem.Link%>" onclick="<%-ejsext.escapeHTML(menuitem.OnClick?menuitem.OnClick+';return false;':'')%>" data-id="<%=menuitem.ID%>" class="xsubmenuitem xsubmenuitem_<%=ejsext.escapeCSSClass(menuitem.ID)%> <%-ejsext.iif(menuitem.Selected,'selected')%>"><%=menuitem.Title%></a><%-ejsext.iif(i<submenu.length-1,'<div>&nbsp;|&nbsp;</div>')%><%
     }
     %><a class="xsubmenu_more" href="#">Menu &nbsp;&#9656;</a><%