Fixed raw mode; Tentative fix for DFL-3292: Inconsistent results for response body of redirects in Network Logger

Author: Daniel Herzog

src/network/network_details_templates.js

@@ -57,7 +57,7 @@ templates._details_content = function(entry, do_raw)
      responsecode = responsecode + " " + cls.ResourceUtil.http_status_codes[responsecode];
 
   // Bind a template function for raw / not-raw, on demand.
-  var template_func_name = "_requests_responses_" + do_raw ? "raw" : "not_raw" + "_bound";
+  var template_func_name = "_requests_responses_" + (do_raw ? "raw" : "not_raw" + "_bound");
   if (!this[template_func_name])
     this[template_func_name] = this.requests_responses.bind(this, do_raw);
 
@@ -377,7 +377,7 @@ templates._response_body = function(resp, do_raw, is_last_response)
   var ret = [this._wrap_pre("\n")]; // todo: no, then it's (really) empty there shouldn't be a separator either. For images it looks a bit wrong too, since the img elem makes its own space too.
 
   var classname = "";
-  if (resp.body_unavailable ||
+  if ((resp.saw_responsefinished && resp.body_unavailable) ||
       !resp.responsebody && resp.is_unloaded)
   {
     classname = "network_info";

src/network/network_service.js

@@ -964,6 +964,11 @@ cls.NetworkLoggerEntryPrototype = function()
     return Boolean(this._current_response && this._current_response.responsebody);
   });
 
+  this.__defineGetter__("current_response_saw_responsefinished", function()
+  {
+    return Boolean(this._current_response && this._current_response.saw_responsefinished);
+  });
+
   this.__defineGetter__("duration", function()
   {
     return (this.events.length && this.endtime - this.starttime) || 0;
@@ -981,6 +986,8 @@ cls.NetworkLoggerEntryPrototype = function()
      return Boolean(this._current_request);
   });
 
+  // todo: add empty setters.
+
 };
 
 cls.NetworkLoggerEntryPrototype.prototype = new URIPrototype("url");
@@ -1051,6 +1058,7 @@ cls.NetworkLoggerResponse = function(entry)
   this.responsebody = null;
   this.header_tokens = null; // This is set from template code, when it's first needed
   this.is_response = true; // Simpler for recognizing than dealing with comparing the constructor
+  this.saw_responsefinished = false;
 
   // The following are duplicated from the entry to have them available directly on the response
   this.logger_entry_type = entry.type;
@@ -1078,15 +1086,22 @@ cls.NetworkLoggerResponsePrototype = function()
 
   this._update_event_responsefinished = function(event)
   {
+    this.saw_responsefinished = true;
     if (event.data && event.data.content)
     {
+      // event.data is of type ResourceData here.
+      // todo: this does not set body_unavailable = true when there is no mimeType. does that make sense?
       this.responsebody = event.data;
     }
   };
 
   this._update_event_responsebody = function(event)
   {
+    // "The used mime type. This may be different from the mime type advertised in the HTTP headers."
+    // Todo: So this can mean that there was no response, this is better represented through "!saw_responsefinished" though,
+    // or that it was somehow invalid? Not so sure.
     if (!event.mimeType) { this.body_unavailable = true; }
+    // event is of type ResourceData here.
     this.responsebody = event;
     // todo: check how to distinguish body_unavailable and empty body.
   };
@@ -1096,7 +1111,7 @@ cls.NetworkLoggerResponsePrototype = function()
     this.is_unloaded = true;
   };
 
-  // The following sync changes on Entry.
+  // The following are to reflect changes that happened on Entry.
   this._update_event_urlfinished = function(event)
   {
     this.logger_entry_is_finished = true;

src/network/network_view.js

@@ -184,7 +184,10 @@ cls.NetworkLogView = function(id, name, container_class, html, default_handler)
       if (entry)
       {
         // todo: it would be good if we knew if the whole context is finished. Better only to get_body then, less potential to disturb.
-        if (entry.is_finished && !entry.current_response_has_responsebody && !entry.called_get_body)
+        if (!entry.current_response_has_responsebody &&
+            !entry.called_get_body && 
+            entry.is_finished &&
+            entry.current_response_saw_responsefinished)
           this._service.get_body(entry.id, this.update_bound);
 
         template = [template, this._render_details_view(entry)];