From ebc4df76fef37fb51415c23d84af590e48a93069 Mon Sep 17 00:00:00 2001
From: rsleevi <rsleevi@chromium.org>
Date: Tue, 21 Jul 2015 15:05:16 -0700
Subject: Revert of Parse HPKP report-uri and persist in
TransportSecurityPersister (patchset #11 id:200001 of
https://codereview.chromium.org/1211363005/)
Reason for revert:
Causes Win7 to hang
Original issue's description:
> Parse HPKP report-uri and persist in TransportSecurityPersister
>
> This CL parses the report-uri attribute on HPKP headers and stores them
> in TransportSecurityPersister.
>
> This is CL #1.
> CL #2: crrev.com/1212973002 (add net::CertificateReportSender)
> CL #3: crrev.com/1212613004 (add net::TransportSecurityReporter)
> CL #4: crrev.com/1213783005 (send HPKP reports)
>
> BUG=445793
>
> Committed: https://crrev.com/1320e36d908427d615357df1630348bfb38cb5c4
> Cr-Commit-Position: refs/heads/master@{#339667}
TBR=davidben@chromium.org,eroman@chromium.org,estark@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=445793
Review URL: https://codereview.chromium.org/1249823002
Cr-Commit-Position: refs/heads/master@{#339759}
---
net/http/http_util.h | 27 ++++++++-------------------
1 file changed, 8 insertions(+), 19 deletions(-)
(limited to 'net/http/http_util.h')
diff --git a/net/http/http_util.h b/net/http/http_util.h
index 1bb3c93..79a41ac 100644
--- a/net/http/http_util.h
+++ b/net/http/http_util.h
@@ -29,6 +29,14 @@ class NET_EXPORT HttpUtil {
// is stripped (username, password, reference).
static std::string SpecForRequest(const GURL& url);
+ // Locates the next occurance of delimiter in line, skipping over quoted
+ // strings (e.g., commas will not be treated as delimiters if they appear
+ // within a quoted string). Returns the offset of the found delimiter or
+ // line.size() if no delimiter was found.
+ static size_t FindDelimiter(const std::string& line,
+ size_t search_start,
+ char delimiter);
+
// Parses the value of a Content-Type header. The resulting mime_type and
// charset values are normalized to lowercase. The mime_type and charset
// output values are only modified if the content_type_str contains a mime
@@ -315,22 +323,9 @@ class NET_EXPORT HttpUtil {
// calls to GetNext() or after the NameValuePairsIterator is destroyed.
class NET_EXPORT NameValuePairsIterator {
public:
- // Whether or not values are optional. VALUES_OPTIONAL allows
- // e.g. name1=value1;name2;name3=value3, whereas VALUES_NOT_OPTIONAL
- // will treat it as a parse error because name2 does not have a
- // corresponding equals sign.
- enum OptionalValues { VALUES_OPTIONAL, VALUES_NOT_OPTIONAL };
-
- NameValuePairsIterator(std::string::const_iterator begin,
- std::string::const_iterator end,
- char delimiter,
- OptionalValues optional_values);
-
- // Treats values as not optional by default (VALUES_NOT_OPTIONAL).
NameValuePairsIterator(std::string::const_iterator begin,
std::string::const_iterator end,
char delimiter);
-
~NameValuePairsIterator();
// Advances the iterator to the next pair, if any. Returns true if there
@@ -358,8 +353,6 @@ class NET_EXPORT HttpUtil {
value_end_);
}
- bool value_is_quoted() const { return value_is_quoted_; }
-
// The value before unquoting (if any).
std::string raw_value() const { return std::string(value_begin_,
value_end_); }
@@ -380,10 +373,6 @@ class NET_EXPORT HttpUtil {
std::string unquoted_value_;
bool value_is_quoted_;
-
- // True if values are required for each name/value pair; false if a
- // name is permitted to appear without a corresponding value.
- bool values_optional_;
};
};
--
cgit v1.1