diff options
| author | Steve Block <steveblock@google.com> | 2012-04-12 07:59:06 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-12 07:59:06 -0700 |
| commit | ba8b643c79877a23cd76135cfc0e72918db70892 (patch) | |
| tree | 2e95f615236fba04e2942bf3febd244e548b8306 /Source/WebCore/platform/KURLGoogle.cpp | |
| parent | 9d5dcb4073f42efce6325ead421506902827febf (diff) | |
| parent | c57e584da242d96ba18578a71f4634adc9d1fff6 (diff) | |
| download | external_webkit-ba8b643c79877a23cd76135cfc0e72918db70892.zip external_webkit-ba8b643c79877a23cd76135cfc0e72918db70892.tar.gz external_webkit-ba8b643c79877a23cd76135cfc0e72918db70892.tar.bz2 | |
Merge "Cherry-pick WebKit change r94132 to fix default port in URLs"
Diffstat (limited to 'Source/WebCore/platform/KURLGoogle.cpp')
| -rw-r--r-- | Source/WebCore/platform/KURLGoogle.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/Source/WebCore/platform/KURLGoogle.cpp b/Source/WebCore/platform/KURLGoogle.cpp index 370862f..7bb1d53 100644 --- a/Source/WebCore/platform/KURLGoogle.cpp +++ b/Source/WebCore/platform/KURLGoogle.cpp @@ -670,16 +670,12 @@ void KURL::setPort(unsigned short i) { KURLGooglePrivate::Replacements replacements; String portStr; - if (i) { - portStr = String::number(i); - replacements.SetPort( - reinterpret_cast<const url_parse::UTF16Char*>(portStr.characters()), - url_parse::Component(0, portStr.length())); - } else { - // Clear any existing port when it is set to 0. - replacements.ClearPort(); - } + portStr = String::number(i); + replacements.SetPort( + reinterpret_cast<const url_parse::UTF16Char*>(portStr.characters()), + url_parse::Component(0, portStr.length())); + m_url.replaceComponents(replacements); } |