sdk/lib/_internal/compiler/implementation/util/uri_extras.dart - Issue 16019002: Merge the dart:uri library into dart:core and update the Uri class

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: sdk/lib/_internal/compiler/implementation/util/uri_extras.dart

Issue 16019002: Merge the dart:uri library into dart:core and update the Uri class (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Add missing files Created 7 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« pkg/http/lib/src/multipart_request.dart ('K') | « sdk/lib/_internal/compiler/implementation/source_map_builder.dart ('k') | sdk/lib/_internal/compiler/samples/compile_loop/compile_loop.dart » ('j') | sdk/lib/core/core.dart » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: sdk/lib/_internal/compiler/implementation/util/uri_extras.dart

diff --git a/sdk/lib/_internal/compiler/implementation/util/uri_extras.dart b/sdk/lib/_internal/compiler/implementation/util/uri_extras.dart

index f43e8261bb6e0811957ec06cb42ba42db4a8f5bf..654341d24d91f3640773ca7e1740a0b10c986545 100644

--- a/sdk/lib/_internal/compiler/implementation/util/uri_extras.dart

+++ b/sdk/lib/_internal/compiler/implementation/util/uri_extras.dart

@@ -5,7 +5,6 @@

library uri_extras;

import 'dart:math';

-import 'dart:uri';

String relativize(Uri base, Uri uri, bool isWindows) {

if (!base.path.startsWith('/')) {

@@ -31,7 +30,7 @@ String relativize(Uri base, Uri uri, bool isWindows) {

if (equalsNCS(base.scheme, 'file') &&

equalsNCS(base.scheme, uri.scheme) &&

base.userInfo == uri.userInfo &&

- equalsNCS(base.domain, uri.domain) &&

+ equalsNCS(base.host, uri.host) &&

base.port == uri.port &&

uri.query == "" && uri.fragment == "") {

if (normalize(uri.path).startsWith(normalize(base.path))) {