diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-24 11:30:15 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-30 12:56:19 +0000 |
commit | 6036726eb981b6c4b42047513b9d3f4ac865daac (patch) | |
tree | 673593e70678e7789766d1f732eb51f613a2703b /chromium/third_party/blink/renderer/platform/network | |
parent | 466052c4e7c052268fd931888cd58961da94c586 (diff) | |
download | qtwebengine-chromium-6036726eb981b6c4b42047513b9d3f4ac865daac.tar.gz |
BASELINE: Update Chromium to 70.0.3538.78
Change-Id: Ie634710bf039e26c1957f4ae45e101bd4c434ae7
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/platform/network')
7 files changed, 26 insertions, 13 deletions
diff --git a/chromium/third_party/blink/renderer/platform/network/DEPS b/chromium/third_party/blink/renderer/platform/network/DEPS index 77af399ae9c..e31a6fc2b5b 100644 --- a/chromium/third_party/blink/renderer/platform/network/DEPS +++ b/chromium/third_party/blink/renderer/platform/network/DEPS @@ -25,8 +25,6 @@ include_rules = [ "+third_party/blink/renderer/platform/heap", "+third_party/blink/renderer/platform/instrumentation", "+third_party/blink/renderer/platform/loader", - "+third_party/blink/renderer/platform/loader", - "+third_party/blink/renderer/platform/loader", "+third_party/blink/renderer/platform/platform_export.h", "+third_party/blink/renderer/platform/scheduler", "+third_party/blink/renderer/platform/shared_buffer.h", diff --git a/chromium/third_party/blink/renderer/platform/network/content_security_policy_parsers.cc b/chromium/third_party/blink/renderer/platform/network/content_security_policy_parsers.cc index 50b795fd45f..2107d3cb0ac 100644 --- a/chromium/third_party/blink/renderer/platform/network/content_security_policy_parsers.cc +++ b/chromium/third_party/blink/renderer/platform/network/content_security_policy_parsers.cc @@ -66,4 +66,7 @@ STATIC_ASSERT_ENUM(kWebContentSecurityPolicySourceHTTP, kContentSecurityPolicyHeaderSourceHTTP); STATIC_ASSERT_ENUM(kWebContentSecurityPolicySourceMeta, kContentSecurityPolicyHeaderSourceMeta); +STATIC_ASSERT_ENUM(kWebContentSecurityPolicySourceOriginPolicy, + kContentSecurityPolicyHeaderSourceOriginPolicy); + } // namespace blink diff --git a/chromium/third_party/blink/renderer/platform/network/content_security_policy_parsers.h b/chromium/third_party/blink/renderer/platform/network/content_security_policy_parsers.h index 0fb0dc51a1e..e352fa904e3 100644 --- a/chromium/third_party/blink/renderer/platform/network/content_security_policy_parsers.h +++ b/chromium/third_party/blink/renderer/platform/network/content_security_policy_parsers.h @@ -20,7 +20,8 @@ enum ContentSecurityPolicyHeaderType { enum ContentSecurityPolicyHeaderSource { kContentSecurityPolicyHeaderSourceHTTP, - kContentSecurityPolicyHeaderSourceMeta + kContentSecurityPolicyHeaderSourceMeta, + kContentSecurityPolicyHeaderSourceOriginPolicy }; enum ContentSecurityPolicyHashAlgorithm { diff --git a/chromium/third_party/blink/renderer/platform/network/header_field_tokenizer.cc b/chromium/third_party/blink/renderer/platform/network/header_field_tokenizer.cc index 7825946bf63..b48dfaf9288 100644 --- a/chromium/third_party/blink/renderer/platform/network/header_field_tokenizer.cc +++ b/chromium/third_party/blink/renderer/platform/network/header_field_tokenizer.cc @@ -55,7 +55,7 @@ bool IsTokenCharacter(Mode mode, UChar c) { HeaderFieldTokenizer::HeaderFieldTokenizer(const String& header_field) : index_(0u), input_(header_field) { - SkipSpaces(); + SkipOptionalWhitespace(); } HeaderFieldTokenizer::HeaderFieldTokenizer(HeaderFieldTokenizer&&) = default; @@ -63,12 +63,13 @@ HeaderFieldTokenizer::HeaderFieldTokenizer(HeaderFieldTokenizer&&) = default; bool HeaderFieldTokenizer::Consume(char c) { // TODO(cvazac) change this to use LChar DCHECK_NE(c, ' '); + DCHECK_NE(c, '\t'); if (IsConsumed() || input_[index_] != c) return false; ++index_; - SkipSpaces(); + SkipOptionalWhitespace(); return true; } @@ -82,7 +83,7 @@ bool HeaderFieldTokenizer::ConsumeQuotedString(String& output) { if (input_[index_] == '"') { output = builder.ToString(); ++index_; - SkipSpaces(); + SkipOptionalWhitespace(); return true; } if (input_[index_] == '\\') { @@ -107,7 +108,7 @@ bool HeaderFieldTokenizer::ConsumeToken(Mode mode, StringView& output) { return false; output = StringView(input_, start, index_ - start); - SkipSpaces(); + SkipOptionalWhitespace(); return true; } @@ -126,10 +127,8 @@ bool HeaderFieldTokenizer::ConsumeTokenOrQuotedString(Mode mode, return true; } -void HeaderFieldTokenizer::SkipSpaces() { - // TODO(cvazac) skip tabs, per: - // https://tools.ietf.org/html/rfc7230#section-3.2.3 - while (!IsConsumed() && input_[index_] == ' ') +void HeaderFieldTokenizer::SkipOptionalWhitespace() { + while (!IsConsumed() && (input_[index_] == ' ' || input_[index_] == '\t')) ++index_; } diff --git a/chromium/third_party/blink/renderer/platform/network/header_field_tokenizer.h b/chromium/third_party/blink/renderer/platform/network/header_field_tokenizer.h index 71702553e29..f8da70cd247 100644 --- a/chromium/third_party/blink/renderer/platform/network/header_field_tokenizer.h +++ b/chromium/third_party/blink/renderer/platform/network/header_field_tokenizer.h @@ -41,7 +41,7 @@ class PLATFORM_EXPORT HeaderFieldTokenizer final { private: bool ConsumeQuotedString(String& output); - void SkipSpaces(); + void SkipOptionalWhitespace(); unsigned index_; const String input_; @@ -49,4 +49,4 @@ class PLATFORM_EXPORT HeaderFieldTokenizer final { } // namespace blink -#endif +#endif // THIRD_PARTY_BLINK_RENDERER_PLATFORM_NETWORK_HEADER_FIELD_TOKENIZER_H_ diff --git a/chromium/third_party/blink/renderer/platform/network/http_names.json5 b/chromium/third_party/blink/renderer/platform/network/http_names.json5 index c50743eb5d0..e12b5fe4c54 100644 --- a/chromium/third_party/blink/renderer/platform/network/http_names.json5 +++ b/chromium/third_party/blink/renderer/platform/network/http_names.json5 @@ -51,6 +51,7 @@ "Pragma", "Purpose", "Range", + // TODO(domfarolino): Remove "Referer" as part of https://crbug.com/850813. "Referer", "Referrer-Policy", "Refresh", diff --git a/chromium/third_party/blink/renderer/platform/network/parsed_content_header_field_parameters_test.cc b/chromium/third_party/blink/renderer/platform/network/parsed_content_header_field_parameters_test.cc index d1ea6bb6fbe..dec0e74de7e 100644 --- a/chromium/third_party/blink/renderer/platform/network/parsed_content_header_field_parameters_test.cc +++ b/chromium/third_party/blink/renderer/platform/network/parsed_content_header_field_parameters_test.cc @@ -35,21 +35,32 @@ void CheckValidity(bool expected, TEST(ParsedContentHeaderFieldParametersTest, Validity) { CheckValidity(true, ""); CheckValidity(true, " "); + CheckValidity(true, "\t"); CheckValidity(true, " ;p1=v1"); + CheckValidity(true, "\t;p1=v1"); CheckValidity(true, "; p1=v1"); + CheckValidity(true, ";\tp1=v1"); CheckValidity(true, ";p1=v1 "); + CheckValidity(true, ";p1=v1\t"); CheckValidity(true, ";p1 = v1"); + CheckValidity(true, ";p1\t=\tv1"); + CheckValidity(true, "; p1 = v1 "); + CheckValidity(true, ";\tp1\t=\tv1\t"); CheckValidity(true, ";z=\"ttx&r=z;;\\u\\\"kd==\""); CheckValidity(true, "; z=\"\xff\""); CheckValidity(false, "\r"); CheckValidity(false, "\n"); CheckValidity(false, " p1=v1"); + CheckValidity(false, "\tp1=v1"); CheckValidity(false, ";p1=v1;"); CheckValidity(false, ";"); CheckValidity(false, "; "); + CheckValidity(false, ";\t"); CheckValidity(false, "; p1"); + CheckValidity(false, ";\tp1"); CheckValidity(false, "; p1;"); + CheckValidity(false, ";\tp1;"); CheckValidity(false, ";\"xx"); CheckValidity(false, ";\"xx=y"); CheckValidity(false, "; \"z\"=u"); |