Support retrieval of raw headers from network stack

webkit/glue/weburlloader_impl.cc

 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // An implementation of WebURLLoader in terms of ResourceLoaderBridge.
 
 #include "webkit/glue/weburlloader_impl.h"
 
 #include "base/file_path.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "net/base/data_url.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "net/http/http_response_headers.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebHTTPHeaderVisitor.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebResourceRawHeaders.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebSecurityPolicy.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURLError.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURLLoadTiming.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURLLoaderClient.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURLRequest.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURLResponse.h"
 #include "webkit/glue/ftp_directory_listing_response_delegate.h"
 #include "webkit/glue/multipart_response_delegate.h"
 #include "webkit/glue/resource_loader_bridge.h"
 #include "webkit/glue/site_isolation_metrics.h"
 #include "webkit/glue/webkit_glue.h"
 
 using base::Time;
 using base::TimeDelta;
 using WebKit::WebData;
 using WebKit::WebHTTPBody;
 using WebKit::WebHTTPHeaderVisitor;
+using WebKit::WebResourceRawHeaders;
 using WebKit::WebSecurityPolicy;
 using WebKit::WebString;
 using WebKit::WebURL;
 using WebKit::WebURLError;
 using WebKit::WebURLLoadTiming;
 using WebKit::WebURLLoader;
 using WebKit::WebURLLoaderClient;
 using WebKit::WebURLRequest;
 using WebKit::WebURLResponse;
 
@@ skipping 107 matching lines @@
     info->security_info.clear();
     info->content_length = -1;
 
     return true;
   }
 
   *status = URLRequestStatus(URLRequestStatus::FAILED, net::ERR_INVALID_URL);
   return false;
 }
 
+typedef ResourceLoaderBridge::DevToolsInfo::HeadersVector HeadersVector;
+
 void PopulateURLResponse(
     const GURL& url,
     const ResourceLoaderBridge::ResponseInfo& info,
     WebURLResponse* response) {
   response->setURL(url);
   response->setResponseTime(info.response_time.ToDoubleT());
   response->setMIMEType(WebString::fromUTF8(info.mime_type));
   response->setTextEncodingName(WebString::fromUTF8(info.charset));
   response->setExpectedContentLength(info.content_length);
   response->setSecurityInfo(info.security_info);
@@ skipping 20 matching lines @@
   timing.setDNSEnd(timing_info.dns_end);
   timing.setConnectStart(timing_info.connect_start);
   timing.setConnectEnd(timing_info.connect_end);
   timing.setSSLStart(timing_info.ssl_start);
   timing.setSSLEnd(timing_info.ssl_end);
   timing.setSendStart(timing_info.send_start);
   timing.setSendEnd(timing_info.send_end);
   timing.setReceiveHeadersEnd(timing_info.receive_headers_end);
   response->setLoadTiming(timing);
 
+  if (info.devtools_info.get()) {
+    WebResourceRawHeaders rawHeaders;
+
+    const HeadersVector& request_headers = info.devtools_info->request_headers;
+    for (HeadersVector::const_iterator it = request_headers .begin();
+         it != request_headers.end(); ++it) {
+      rawHeaders.addRequestHeader(WebString::fromUTF8(it->first),
+          WebString::fromUTF8(it->second));
+    }
+    const HeadersVector& response_headers =
+        info.devtools_info->request_headers;
+    for (HeadersVector::const_iterator it = response_headers.begin();
+         it != response_headers.end(); ++it) {
+      rawHeaders.addResponseHeader(WebString::fromUTF8(it->first),
+          WebString::fromUTF8(it->second));
+    }
+    response->setResourceRawHeaders(rawHeaders);
+  }
+
   const net::HttpResponseHeaders* headers = info.headers;
   if (!headers)
     return;
 
   response->setHTTPStatusCode(headers->response_code());
   response->setHTTPStatusText(WebString::fromUTF8(headers->GetStatusText()));
 
   // TODO(darin): We should leverage HttpResponseHeaders for this, and this
   // should be using the same code as ResourceDispatcherHost.
   // TODO(jungshik): Figure out the actual value of the referrer charset and
@@ skipping 141 matching lines @@
       load_flags |= net::LOAD_ONLY_FROM_CACHE;
       break;
     case WebURLRequest::UseProtocolCachePolicy:
       break;
   }
 
   if (request.reportUploadProgress())
     load_flags |= net::LOAD_ENABLE_UPLOAD_PROGRESS;
   if (request.reportLoadTiming())
     load_flags |= net::LOAD_ENABLE_LOAD_TIMING;
+  if (request.reportRawHeaders())
+    load_flags |= net::LOAD_REPORT_RAW_HEADERS;
 
   if (!request.allowCookies() || !request.allowStoredCredentials()) {
     load_flags |= net::LOAD_DO_NOT_SAVE_COOKIES;
     load_flags |= net::LOAD_DO_NOT_SEND_COOKIES;
   }
 
   if (!request.allowStoredCredentials())
     load_flags |= net::LOAD_DO_NOT_SEND_AUTH_DATA;
 
-
   // TODO(jcampan): in the non out-of-process plugin case the request does not
   // have a requestor_pid. Find a better place to set this.
   int requestor_pid = request.requestorProcessID();
   if (requestor_pid == 0)
     requestor_pid = base::GetCurrentProcId();
 
   HeaderFlattener flattener(load_flags);
   request.visitHTTPHeaderFields(&flattener);
 
   // TODO(abarth): These are wrong!  I need to figure out how to get the right
@@ skipping 311 matching lines @@
 
 void WebURLLoaderImpl::cancel() {
   context_->Cancel();
 }
 
 void WebURLLoaderImpl::setDefersLoading(bool value) {
   context_->SetDefersLoading(value);
 }
 
 }  // namespace webkit_glue