diff options
| author | tsepez@chromium.org <tsepez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-18 20:55:09 +0000 |
|---|---|---|
| committer | tsepez@chromium.org <tsepez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-18 20:55:09 +0000 |
| commit | f80e677d270a2db1037653a8182d6a04be498dce (patch) | |
| tree | 0fb67e06f3d6a201a1451d14dbcc79e5d37ad68c /url/url_canon_relative.cc | |
| parent | b146234bd8b01a687b5f6ddaa7c6445773b2cf89 (diff) | |
| download | chromium_src-f80e677d270a2db1037653a8182d6a04be498dce.zip chromium_src-f80e677d270a2db1037653a8182d6a04be498dce.tar.gz chromium_src-f80e677d270a2db1037653a8182d6a04be498dce.tar.bz2 | |
Revert 223928 "Make relative file url parsing fail where there i..."
> Make relative file url parsing fail where there is a host:port in the relative URL.
>
> BUG=285720
> R=brettw@chromium.org, jar@chromium.org
>
> Review URL: https://codereview.chromium.org/23464046
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/23702051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223940 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'url/url_canon_relative.cc')
| -rw-r--r-- | url/url_canon_relative.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/url/url_canon_relative.cc b/url/url_canon_relative.cc index f9e6c13..84317f8 100644 --- a/url/url_canon_relative.cc +++ b/url/url_canon_relative.cc @@ -479,7 +479,7 @@ bool DoResolveRelativeURL(const char* base_url, // handles the special case where the URL is only slashes, since that // doesn't have a host part either. if (base_is_file && - (num_slashes >= 2 || num_slashes == relative_component.len)) { + (num_slashes > 2 || num_slashes == relative_component.len)) { return DoResolveAbsoluteFile(relative_url, relative_component, query_converter, output, out_parsed); } |