Added classname to warnings; Better SPDY detection; Fixed checks for headers

Author: Daniel Herzog

src/network/network_details_templates.js

@@ -216,13 +216,15 @@ templates._request_headers = function(req, do_raw)
       var METHOD = 0;
       return this._pre(this.headers_tonkenized(req.header_tokens, [METHOD]));
     }
-    return ui_strings.S_NETWORK_REQUEST_NO_HEADERS_LABEL;
+    return ["span", ui_strings.S_NETWORK_REQUEST_NO_HEADERS_LABEL,
+            "class", templates.UI_CLASSNAME];
   }
 
   var ret = [];
   if (!req.request_headers)
   {
-    ret.push(ui_strings.S_NETWORK_REQUEST_NO_HEADERS_LABEL);
+    ret.push(["span", ui_strings.S_NETWORK_REQUEST_NO_HEADERS_LABEL,
+              "class", templates.UI_CLASSNAME]);
   }
   else
   {
@@ -269,21 +271,23 @@ templates._response_headers = function(resp, do_raw)
     if (!resp.header_tokens)
     {
       resp.header_tokens = [];
-      var tokenizer = new cls.HTTPHeaderTokenizer();
-      tokenizer.tokenize(resp.response_headers_raw, this._token_receiver.bind(this, resp.header_tokens));
+      if (resp.response_headers_raw)
+      {
+        var tokenizer = new cls.HTTPHeaderTokenizer();
+        tokenizer.tokenize(resp.response_headers_raw, this._token_receiver.bind(this, resp.header_tokens));
+      }
     }
 
     if (resp.header_tokens.length)
     {
       var RESPONSECODE = 1;
       return this._pre(this.headers_tonkenized(resp.header_tokens, [RESPONSECODE]));
     }
-    return [
-      ui_strings.S_NETWORK_REQUEST_NO_HEADERS_LABEL
-    ];
+    return ["span", ui_strings.S_NETWORK_REQUEST_NO_HEADERS_LABEL,
+            "class", templates.UI_CLASSNAME];
   }
 
-  var ret = resp.response_headers && resp.response_headers.map(this._headers_pseudo_raw) || [];
+  var ret = resp.response_headers && resp.response_headers.map(this._headers_pseudo_raw);
   if (resp.first_line)
   {
     var firstline = [];
@@ -299,7 +303,11 @@ templates._response_headers = function(resp, do_raw)
       ret.unshift(this.headers_tonkenized(resp.firstline_tokens, [RESPONSECODE]));
     }
   }
-
+  if (!ret)
+  {
+    ret = ["span", ui_strings.S_NETWORK_REQUEST_NO_HEADERS_LABEL,
+           "class", templates.UI_CLASSNAME];
+  }
   return templates._pre(ret);
 };
 

src/network/network_service.js

@@ -1000,8 +1000,8 @@ cls.NetworkLoggerRequestPrototype = function()
   this._update_event_requestheader = function(event)
   {
     this.request_headers = event.headerList;
-    // Todo: Not sure I should rely on this
-    if (event.raw != "SPDY DATA")
+    // Don't set a first_line for a SPDY request
+    if (event.raw && event.raw.indexOf("\n") != -1)
       this.first_line = event.raw && event.raw.split("\n")[0];
 
     for (var n = 0, header; header = this.request_headers[n]; n++)
@@ -1069,9 +1069,8 @@ cls.NetworkLoggerResponsePrototype = function()
     // At the time of the this event, it's possible that more than the header
     // has been read from the socket already.
     this.response_headers_raw = event.raw.split("\r\n\r\n")[0];
-    
-    // Todo: Not sure I should rely on this
-    if (this.response_headers_raw != "SPDY DATA")
+    // Don't set a first_line for a SPDY request
+    if (this.response_headers_raw && this.response_headers_raw.indexOf("\n") != -1)
       this.first_line = this.response_headers_raw.split("\n")[0];
   };