Added raw view for multipart requests; Some fixes

Author: Daniel Herzog

src/network/network_details_templates.js

@@ -15,6 +15,11 @@ templates._detail_row = function(wrap)
   return ["tr", ["td", wrap, "colspan", "2"]];
 };
 
+templates.wrap_pre = function(str)
+{
+  return ["pre", str, "class", "mono"];
+};
+
 templates.details = function(entry, left_val, do_raw)
 {
   return (
@@ -191,11 +196,25 @@ templates._response_headers = function(resp, do_raw)
   return ["tbody", ret.map(templates._detail_row)];
 };
 
-templates.headers_list = function(headers, firstline)
+templates.headers_list = function(headers, firstline, do_raw)
 {
-  var lis = headers.map(function(header) {
+  var map;
+  if (do_raw) // todo: when raw, this is currently just for headers of parts in mutipart. should be used for others too, to gain the speclinks.
+  {
+    map = function(header)
+    {
+      return templates.wrap_pre([["span", header.name + ":", "data-spec", "http#" + header.name], ["span", " " + header.value]]);
+    };
+  }
+  else
+  {
+    map = function(header)
+    {
       return [["th", header.name + ":", "data-spec", "http#" + header.name], ["td", header.value]];
-  });
+    };
+  }
+
+  var lis = headers.map(map);
 
   if (firstline)
   {
@@ -204,36 +223,41 @@ templates.headers_list = function(headers, firstline)
   return lis;
 };
 
-templates.body_separator = function()
-{
-  return ["pre", " ", "class", "mono"];
-};
-
 templates._request_body = function(req, do_raw)
 {
   if (req.requestbody == null)
     return [];
 
-  var ret = [templates.body_separator()];
+  var ret = [templates.wrap_pre("\n")];
   if (req.requestbody.partList.length) // multipart
   {
+    var use_raw_boundary = false;
+    if (do_raw && req.boundary)
+      use_raw_boundary = true;
+
     for (var n = 0, part; part = req.requestbody.partList[n]; n++)
     {
-      ret.concat(templates.headers_list(part.headerList));
+      if (use_raw_boundary && n === 0)
+        ret.push(this.wrap_pre(req.boundary));
+
+      ret.extend(templates.headers_list(part.headerList, null, do_raw));
+      ret.push(this.wrap_pre("\n"));
       if (part.content && part.content.stringData)
-        ret.push(["pre", part.content.stringData, "class", "mono"]);
+        ret.push(["pre", part.content.stringData, "class", "mono network-body"]);
       else
         ret.push(["p", ui_strings.S_NETWORK_N_BYTE_BODY.replace("%s", part.contentLength)]);
 
       if (n < req.requestbody.partList.length - 1)
-        ret.push(["hr"]); // todo: when raw, use the boundary here
+        ret.push(use_raw_boundary ? this.wrap_pre(req.boundary) : ["hr"]);
+      else if (use_raw_boundary)
+        ret.push(this.wrap_pre(req.boundary + "--\n"));
     }
   }
   else if (req.requestbody.mimeType.startswith("application/x-www-form-urlencoded"))
   {
     if (do_raw)
     {
-      ret.push(["pre", req.requestbody.content.stringData]);
+      ret.push(["pre", req.requestbody.content.stringData, "class", "mono network-body"]);
     }
     else
     {
@@ -284,7 +308,7 @@ templates._request_body = function(req, do_raw)
 
 templates._response_body = function(resp, do_raw, is_last)
 {
-  var ret = [templates.body_separator()]; // todo: no, then it's (really) empty there shouldn't be a separator either.
+  var ret = [templates.wrap_pre("\n")]; // todo: no, then it's (really) empty there shouldn't be a separator either.
 
   var classname = "";
   if (resp.body_unavailable ||

src/network/network_service.js

@@ -918,6 +918,7 @@ cls.NetworkLoggerRequest = function(entry)
   this.request_type = null;
   this.firstline = null;
   this.requestbody = null;
+  this.boundary = "";
 };
 
 cls.NetworkLoggerRequestPrototype = function()
@@ -936,13 +937,15 @@ cls.NetworkLoggerRequestPrototype = function()
       if (header.name.toLowerCase() == "content-type")
       {
         this.request_type = header.value;
+        this.boundary = header.value.split("; boundary=")[1] || "";
         break;
       }
     }
     this.firstline = event.raw.split("\n")[0]; // todo: event.raw.split("\r\n")[0];
     // The body can be contained in event.raw.
     // At the time of the this event, it's possible that more than the header
     // has been written to the socket already.
+    this.raw = event.raw; // todo: debugging only. remove me.
     this.request_headers_raw = event.raw.split("\r\n\r\n")[0];
   };
 

src/network/network_style.css

@@ -547,7 +547,7 @@
   margin: 10px 0;
 }
 
-pre.network-body
+table pre.network-body
 {
   /* work-around CORE-46966: Big pre element breaks layout in a table */
   float: left;

src/scripts/spec_links.js

@@ -2012,6 +2012,7 @@ SpecLinks.specs = {
     "Content-MD5": "http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.15",
     "Content-Range": "http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.16",
     "Content-Type": "http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.17",
+    "Content-Disposition": "http://www.w3.org/Protocols/rfc2616/rfc2616-sec19.html#sec19.5.1",
     "Date": "http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.18",
     "Clockless Origin Server Operation": "http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.18.1",
     "ETag": "http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.19",