summaryrefslogtreecommitdiffstats
path: root/chrome/common/net/url_fetcher.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/common/net/url_fetcher.cc')
-rw-r--r--chrome/common/net/url_fetcher.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/common/net/url_fetcher.cc b/chrome/common/net/url_fetcher.cc
index 042ff2f..c01eb6a 100644
--- a/chrome/common/net/url_fetcher.cc
+++ b/chrome/common/net/url_fetcher.cc
@@ -13,6 +13,7 @@
#include "googleurl/src/gurl.h"
#include "net/base/load_flags.h"
#include "net/base/io_buffer.h"
+#include "net/http/http_request_headers.h"
#include "net/http/http_response_headers.h"
#include "net/url_request/url_request.h"
#include "net/url_request/url_request_context.h"
@@ -81,7 +82,7 @@ class URLFetcher::Core
scoped_refptr<URLRequestContextGetter> request_context_getter_;
// Cookie/cache info for the request
ResponseCookies cookies_; // Response cookies
- std::string extra_request_headers_;// Extra headers for the request, if any
+ net::HttpRequestHeaders extra_request_headers_;
scoped_refptr<net::HttpResponseHeaders> response_headers_;
std::string upload_content_; // HTTP POST payload
@@ -238,10 +239,8 @@ void URLFetcher::Core::StartURLRequest() {
DCHECK(!upload_content_type_.empty());
request_->set_method("POST");
- if (!extra_request_headers_.empty())
- extra_request_headers_ += "\r\n";
- StringAppendF(&extra_request_headers_,
- "Content-Type: %s", upload_content_type_.c_str());
+ extra_request_headers_.SetHeader(net::HttpRequestHeaders::kContentType,
+ upload_content_type_);
request_->AppendBytesToUpload(upload_content_.data(),
static_cast<int>(upload_content_.size()));
break;
@@ -254,7 +253,7 @@ void URLFetcher::Core::StartURLRequest() {
NOTREACHED();
}
- if (!extra_request_headers_.empty())
+ if (!extra_request_headers_.IsEmpty())
request_->SetExtraRequestHeaders(extra_request_headers_);
request_->Start();
@@ -332,7 +331,8 @@ int URLFetcher::load_flags() const {
void URLFetcher::set_extra_request_headers(
const std::string& extra_request_headers) {
- core_->extra_request_headers_ = extra_request_headers;
+ core_->extra_request_headers_.Clear();
+ core_->extra_request_headers_.AddHeadersFromString(extra_request_headers);
}
void URLFetcher::set_request_context(