Release XLT 6.2.4

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.xceptance</groupId>
     <artifactId>xlt</artifactId>
-    <version>6.2.3</version>
+    <version>6.2.4</version>
     <packaging>jar</packaging>
 
     <name>XLT</name>

resultbrowser/src/css/default.css

@@ -298,6 +298,7 @@ body {
 #content {
     background-color: white;
     height: 100%;
+    overflow: auto;
 }
 
 #actioncontent {
@@ -307,7 +308,6 @@ body {
 #postrequestparameters,
 #requestBodySmall {
     width: 100%;
-    height: 100%;
 }
 
 #requestBodySmall > textarea {
@@ -535,8 +535,14 @@ table.key-value-table td.value .csep {
     flex-flow: column;
 }
 
+.flexItem-fill {
+    flex: 1 1;    /* grow/shrink as needed */
+    flex-basis: 0px !important;  /* HACK: Parcel's CSS optimizer replaces 'flex: 1 1 0px' with 'flex: 1' and browsers interpret 'flex: 1' as 'flex: 1 1 0%' which is not what we want. */
+}
+
 .gutter {
     background-color: rgb(169, 169, 169);
+    flex: 0 0 auto;    /* don't grow/shrink the splitter */
 }
 
 .gutter.gutter-horizontal {

resultbrowser/src/index.html

@@ -27,22 +27,22 @@
         <div id="wrapper" class="flexContainer flexFlowColumn">
             <div id="mainContent" class="flexContainer heightFull">
                 <!-- frame the whole left menu side for splitting with vertical split bar-->
-                <div id="leftSideMenu">
+                <div id="leftSideMenu" class="flexContainer flexFlowColumn">
                     <div id="header" class="flexContainer">
                         <div class="logo flexContainer">
                             <img alt="xlt logo" border="0" src="data-url:images/xlt-logo.svg" halign="left" width="85" height="20" />
                             <h1>Result Browser <span id="menu-icon">&#9776;</span></h1>
                         </div>
                     </div>
 
-                    <div id="navigation">
+                    <div id="navigation" class="flexContainer flexFlowColumn flexItem-fill">
                         <!-- transaction will come here dynamically -->
                         <div id="transaction" class="unselectable" unselectable="on">
                             <span class="name"></span>
                             <a class="har" href="harviewer.html" target="_blank">View as HAR</a>
                         </div>
                         <!-- actions and requests will come here dynamically -->
-                        <div id="actionlist" class="unselectable" unselectable="on">
+                        <div id="actionlist" class="unselectable flexItem-fill" unselectable="on">
                         </div>
                     </div>
                 </div>
@@ -159,7 +159,7 @@ <h2>Response Headers</h2>
                             </div>
                             <img id="requestimage" />
                             <pre><code id="requesttext"></code></pre>
-                            <div class="errorContent heightFull">
+                            <div id="loadErrorContent" class="errorContent heightFull">
                                 <div id="errorMessage" class="error">
                                     <p>Failed to load '<span class="filename"></span>'.</p>
                                     <p>You see this message for one of the following reasons:</p>

resultbrowser/src/js/resultbrowser.js

@@ -76,7 +76,7 @@
 
     function setText(element, text) {
         if (element) {
-            element.innerText = text;
+            element.innerText = text || "";
         }
     }
 
@@ -160,6 +160,8 @@
             if (!response.ok) {
                 forEachElement(transaction.querySelectorAll(".har"), hide);
             }
+        }).catch((error) => {
+            forEachElement(transaction.querySelectorAll(".har"), hide);
         });
 
         initEvents();
@@ -514,7 +516,7 @@
             forEachElement(actionlist.querySelectorAll(".active"), (el) => el.classList.remove("active"));
             element.classList.add("active");
 
-            hide(getElementById("errorMessage"))
+            hide(getElementById("loadErrorContent"));
 
             queryFirst("#jsonViewerActions .search").value = "";
 
@@ -579,7 +581,7 @@
 
                             errorMessageFileName.setAttribute('disabled', '');
                             setText(errorMessageFileName, requestData.fileName);
-                            show(getElementById("errorMessage"));
+                            show(getElementById("loadErrorContent"));
                         });
                 }
             }
@@ -612,7 +614,7 @@
             if (bodyRaw.length > 0) {
                 // request body
                 setText(requestBodySmall.querySelector("textarea"), bodyRaw);
-                hide(requestBodySmall);
+                show(requestBodySmall);
                 hide(postRequestParam);
             }
             else {
@@ -1005,7 +1007,7 @@
             Split(['#leftSideMenu', '#content'], {
                 sizes: [15, 85],
                 minSize: [300, 600],
-                gutterSize: 2
+                gutterSize: 3
             })
 
             // activate first request-tab

src/main/java/com/xceptance/xlt/ec2/AbstractEC2Client.java

@@ -326,6 +326,7 @@ public int compare(final SecurityGroup i1, final SecurityGroup i2)
     protected List<Image> getImages(final Region region, final String... imageIds)
     {
         final DescribeImagesRequest describeImagesRequest = new DescribeImagesRequest().withOwners("self", "614612213257")
+                                                                                       .withFilters(new Filter("architecture").withValues("x86_64"))
                                                                                        .withImageIds(imageIds);
         final List<Image> images = getClient(region).describeImages(describeImagesRequest).getImages();
 

src/main/java/com/xceptance/xlt/engine/resultbrowser/PageTransformer.java

@@ -149,7 +149,7 @@ Document transform(final UrlMapping mapping)
         }
         else
         {
-            // yes, remove any existing content-type meta tag
+            // yes, remove certain meta tags: auto-refresh (unwanted) and content-type (will be recreated below)
             final NodeList metaTags = head.getElementsByTagName("meta");
             for (int i = 0; i < metaTags.getLength(); i++)
             {
@@ -159,9 +159,13 @@ Document transform(final UrlMapping mapping)
                 for (int j = 0; j < attributes.getLength(); j++)
                 {
                     final Attr attribute = (Attr) attributes.item(j);
-                    if (attribute.getName().equalsIgnoreCase("http-equiv") && attribute.getValue().equalsIgnoreCase("content-type"))
+                    if (attribute.getName().equalsIgnoreCase("http-equiv"))
                     {
-                        metaTag.getParentNode().removeChild(metaTag);
+                        final String attributeValue = attribute.getValue();
+                        if (attributeValue.equalsIgnoreCase("content-type") || attributeValue.equalsIgnoreCase("refresh"))
+                        {
+                            metaTag.getParentNode().removeChild(metaTag);
+                        }
                     }
                 }
             }
@@ -366,7 +370,7 @@ String transformLW(final UrlMapping mapping)
                 baseURL = u;
             }
         }
-        
+
         baseURL = URLCleaner.removeUserInfoIfNecessaryAsURL(baseURL);
 
         // get document charset

src/test/java/com/xceptance/xlt/engine/resultbrowser/PageTransformerTest.java

@@ -28,6 +28,7 @@
 import org.junit.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
 
 import com.gargoylesoftware.htmlunit.MockWebConnection;
 import com.gargoylesoftware.htmlunit.WebClient;
@@ -278,6 +279,31 @@ public void testTransformLWPage_BaseUrlHandling() throws Throwable
         }
     }
 
+    @Test
+    public void testTransformHtmlPage_MetaRefreshRemoved() throws Throwable
+    {
+        try (final WebClient wc = new WebClient())
+        {
+            final MockWebConnection conn = new MockWebConnection();
+            conn.setDefaultResponse("<html><head><meta http-equiv=\"content-type\" content=\"text/html; charset=UTF-8\"><meta http-equiv=\"content-security-policy\" content=\"default-src 'self'\"><meta http-equiv=\"refresh\" content=\"10; url=/\"></head></html>");
+            wc.setWebConnection(conn);
+
+            final HtmlPage page = wc.getPage(url);
+
+            final PageDOMClone clone = DomUtils.clonePage(page);
+            final PageTransformer instance = new PageTransformer(clone, true);
+            final UrlMapping urlMapping = new DumpMgr().getUrlMapping();
+
+            final Document doc = instance.transform(urlMapping);
+
+            // check that the refresh http-equiv meta tag has been removed, but not the other two http-equiv metas
+            final NodeList metas = doc.getElementsByTagName("meta");
+            Assert.assertEquals(2, metas.getLength());
+            Assert.assertEquals("content-type", ((Element) metas.item(0)).getAttribute("http-equiv"));
+            Assert.assertEquals("content-security-policy", ((Element) metas.item(1)).getAttribute("http-equiv"));
+        }
+    }
+
     /*
      * TODO: Add more tests
      */