diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-07 23:14:25 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-07 23:14:25 +0000 |
| commit | 88e6b6f3251af7092432c33b7d372a17c7169904 (patch) | |
| tree | 3fde374eed02ee05026449729952f0364609971b /net/ocsp | |
| parent | da244100d3ac663a1f827fc712dc508c7761d207 (diff) | |
| download | chromium_src-88e6b6f3251af7092432c33b7d372a17c7169904.zip chromium_src-88e6b6f3251af7092432c33b7d372a17c7169904.tar.gz chromium_src-88e6b6f3251af7092432c33b7d372a17c7169904.tar.bz2 | |
Pass HttpRequestHeaders to URLRequest::SetExtraRequestHeaders().
BUG=22588
Review URL: http://codereview.chromium.org/1998008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46752 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/ocsp')
| -rw-r--r-- | net/ocsp/nss_ocsp.cc | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/net/ocsp/nss_ocsp.cc b/net/ocsp/nss_ocsp.cc index 3bb34c5..fa08801 100644 --- a/net/ocsp/nss_ocsp.cc +++ b/net/ocsp/nss_ocsp.cc @@ -23,6 +23,7 @@ #include "googleurl/src/gurl.h" #include "net/base/io_buffer.h" #include "net/base/load_flags.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" @@ -187,10 +188,8 @@ class OCSPRequestSession } void AddHeader(const char* http_header_name, const char* http_header_value) { - if (!extra_request_headers_.empty()) - extra_request_headers_ += "\r\n"; - StringAppendF(&extra_request_headers_, - "%s: %s", http_header_name, http_header_value); + extra_request_headers_.SetHeader(http_header_name, + http_header_value); } void Start() { @@ -364,14 +363,12 @@ class OCSPRequestSession 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())); } - if (!extra_request_headers_.empty()) + if (!extra_request_headers_.IsEmpty()) request_->SetExtraRequestHeaders(extra_request_headers_); request_->Start(); @@ -409,7 +406,7 @@ class OCSPRequestSession base::TimeDelta timeout_; // The timeout for OCSP URLRequest* request_; // The actual request this wraps scoped_refptr<net::IOBuffer> buffer_; // Read buffer - std::string extra_request_headers_; // Extra headers for the request, if any + net::HttpRequestHeaders extra_request_headers_; std::string upload_content_; // HTTP POST payload std::string upload_content_type_; // MIME type of POST payload |