summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--chromium/url/url_util.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/chromium/url/url_util.cc b/chromium/url/url_util.cc
index e985d3049a7..829200b4679 100644
--- a/chromium/url/url_util.cc
+++ b/chromium/url/url_util.cc
@@ -344,8 +344,11 @@ bool DoResolveRelative(const char* base_spec,
// The effect is to allow, for example, GURL("qrc:foo").Resolve("bar") to
// return "qrc:bar" instead of just erroring out.
base::StringPiece scheme_piece(&base_spec[base_parsed.scheme.begin], base_parsed.scheme.len);
- if (CustomScheme::FindScheme(scheme_piece))
+ if (const CustomScheme* scheme = CustomScheme::FindScheme(scheme_piece)) {
base_is_hierarchical = true;
+ if (scheme->type == SCHEME_WITHOUT_AUTHORITY)
+ base_is_authority_based = false;
+ }
}
SchemeType unused_scheme_type = SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION;