mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Merge pull request #5030 from deepak1556/webrequest_response_headers_patch

Browse source 
session: webRequest.OnHeadersReceived should accept status line.
This commit is contained in:
Cheng Zhao 2016-04-11 20:04:32 +09:00
commit 5659ee5c0b
3 changed files with 63 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
atom/browser/net/atom_network_delegate.cc
View file

@ -5,6 +5,7 @@
#include "atom/browser/net/atom_network_delegate.h"
#include <string>
#include <utility>
#include "atom/common/native_mate_converters/net_converter.h"
#include "base/stl_util.h"
@ -19,6 +20,9 @@ namespace atom {
namespace {
using ResponseHeadersContainer =
std::pair<scoped_refptr<net::HttpResponseHeaders>*, const std::string&>;
const char* ResourceTypeToString(content::ResourceType type) {
switch (type) {
case content::RESOURCE_TYPE_MAIN_FRAME:
@ -170,10 +174,15 @@ void ReadFromResponseObject(const base::DictionaryValue& response,
}
void ReadFromResponseObject(const base::DictionaryValue& response,
scoped_refptr<net::HttpResponseHeaders>* headers) {
const ResponseHeadersContainer& container) {
const base::DictionaryValue* dict;
std::string status_line;
if (!response.GetString("statusLine", &status_line))
status_line = container.second;
if (response.GetDictionary("responseHeaders", &dict)) {
auto headers = container.first;
*headers = new net::HttpResponseHeaders("");
(*headers)->ReplaceStatusLine(status_line);
for (base::DictionaryValue::Iterator it(*dict);
!it.IsAtEnd();
it.Advance()) {
@ -263,7 +272,8 @@ int AtomNetworkDelegate::OnHeadersReceived(
request, callback, original, override, allowed);
return HandleResponseEvent(
kOnHeadersReceived, request, callback, override, original);
kOnHeadersReceived, request, callback,
std::make_pair(override, original->GetStatusLine()), original);
}
void AtomNetworkDelegate::OnBeforeRedirect(net::URLRequest* request,