chrome/browser/content_settings/content_settings_pattern.cc - Issue 7229005: Include port when creating a pattern for a HTTPS URL

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: chrome/browser/content_settings/content_settings_pattern.cc

Issue 7229005: Include port when creating a pattern for a HTTPS URL (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: updates Created 9 years, 6 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:

Index: chrome/browser/content_settings/content_settings_pattern.cc

diff --git a/chrome/browser/content_settings/content_settings_pattern.cc b/chrome/browser/content_settings/content_settings_pattern.cc

index 77b5036e7df8adc3f76a093e1591bae2e8f7f5e8..15a0e91693c8287bb97b46c31967d362539a6848 100644

--- a/chrome/browser/content_settings/content_settings_pattern.cc

+++ b/chrome/browser/content_settings/content_settings_pattern.cc

@@ -301,7 +301,10 @@ ContentSettingsPattern ContentSettingsPattern::FromURL(

// Unsupported scheme

}

if (url.port().empty()) {

- builder->WithPortWildcard();

+ if (url.SchemeIs(chrome::kHttpsScheme))

+ builder->WithPort(GetDefaultPort(chrome::kHttpsScheme));

+ else

+ builder->WithPortWildcard();

} else {

builder->WithPort(url.port());

}

« no previous file with comments | « no previous file | chrome/browser/content_settings/content_settings_pattern_unittest.cc » ('j') | no next file with comments »