Merge remote-tracking branch 'origin/closedown-4.0.x'

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

esp/services/ws_fs/ws_fsService.cpp

@@ -2330,9 +2330,9 @@ bool CFileSprayEx::onCopy(IEspContext &context, IEspCopy &req, IEspCopyResponse
             }
         }
 
+        CDfsLogicalFileName lfn; // NOTE: must not be moved into block below, or dstname will point to invalid memory
         if (!bRoxie)
         {
-            CDfsLogicalFileName lfn;
             if (!lfn.setValidate(dstname))
                 throw MakeStringException(ECLWATCH_INVALID_INPUT, "invalid destination filename");
             dstname = lfn.get();

esp/services/ws_machine/metrics.xslt

@@ -209,7 +209,8 @@
                   else
                   {
                     var bFF=/Firefox[\/\s](\d+\.\d+)/.test(navigator.userAgent)?1:0;
-                    if (show && bFF && autoUpdateChecked)
+                    var isChrome=/Chrome[\/\s](\d+\.\d+)/.test(navigator.userAgent)?1:0;
+                    if (show && (bFF || isChrome) && autoUpdateChecked)        
                       document.forms[0].submit();
                       //reloadPage();
                   }
@@ -566,8 +567,8 @@
          <xsl:if test="not(Hide=1)">
             <xsl:attribute name="checked">true</xsl:attribute>
          </xsl:if>
-         <xsl:value-of select="Caption"/>
          </input>
+         <xsl:value-of select="Caption"/>
       </td>
    </xsl:template>