From 48bff9faf202913b21be662686a18d2723b47a2d Mon Sep 17 00:00:00 2001 From: "cbiesinger%web.de" Date: Wed, 31 Aug 2005 14:32:19 +0000 Subject: [PATCH] Bug 306310 explicitly specify the charset (as UTF-8) for the about: channels r+sr=darin git-svn-id: svn://10.0.0.236/trunk@179390 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/netwerk/protocol/about/src/nsAboutBlank.cpp | 3 ++- mozilla/netwerk/protocol/about/src/nsAboutBloat.cpp | 3 ++- mozilla/netwerk/protocol/about/src/nsAboutCache.cpp | 3 ++- mozilla/netwerk/protocol/about/src/nsAboutCacheEntry.cpp | 5 +++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/mozilla/netwerk/protocol/about/src/nsAboutBlank.cpp b/mozilla/netwerk/protocol/about/src/nsAboutBlank.cpp index e6f04662f73..425242caa4c 100644 --- a/mozilla/netwerk/protocol/about/src/nsAboutBlank.cpp +++ b/mozilla/netwerk/protocol/about/src/nsAboutBlank.cpp @@ -57,7 +57,8 @@ nsAboutBlank::NewChannel(nsIURI *aURI, nsIChannel **result) if (NS_FAILED(rv)) return rv; rv = NS_NewInputStreamChannel(&channel, aURI, in, - NS_LITERAL_CSTRING("text/html")); + NS_LITERAL_CSTRING("text/html"), + NS_LITERAL_CSTRING("utf-8")); if (NS_FAILED(rv)) return rv; *result = channel; diff --git a/mozilla/netwerk/protocol/about/src/nsAboutBloat.cpp b/mozilla/netwerk/protocol/about/src/nsAboutBloat.cpp index 809b16d66c7..84509c42189 100644 --- a/mozilla/netwerk/protocol/about/src/nsAboutBloat.cpp +++ b/mozilla/netwerk/protocol/about/src/nsAboutBloat.cpp @@ -148,7 +148,8 @@ nsAboutBloat::NewChannel(nsIURI *aURI, nsIChannel **result) nsIChannel* channel; rv = NS_NewInputStreamChannel(&channel, aURI, inStr, - NS_LITERAL_CSTRING("text/plain")); + NS_LITERAL_CSTRING("text/plain"), + NS_LITERAL_CSTRING("utf-8")); if (NS_FAILED(rv)) return rv; *result = channel; diff --git a/mozilla/netwerk/protocol/about/src/nsAboutCache.cpp b/mozilla/netwerk/protocol/about/src/nsAboutCache.cpp index 06735b31f59..45f076ba27f 100644 --- a/mozilla/netwerk/protocol/about/src/nsAboutCache.cpp +++ b/mozilla/netwerk/protocol/about/src/nsAboutCache.cpp @@ -148,7 +148,8 @@ nsAboutCache::NewChannel(nsIURI *aURI, nsIChannel **result) nsIChannel* channel; rv = NS_NewInputStreamChannel(&channel, aURI, inStr, - NS_LITERAL_CSTRING("text/html")); + NS_LITERAL_CSTRING("text/html"), + NS_LITERAL_CSTRING("utf-8")); if (NS_FAILED(rv)) return rv; *result = channel; diff --git a/mozilla/netwerk/protocol/about/src/nsAboutCacheEntry.cpp b/mozilla/netwerk/protocol/about/src/nsAboutCacheEntry.cpp index cb5a70ab2b5..74e9d541d34 100644 --- a/mozilla/netwerk/protocol/about/src/nsAboutCacheEntry.cpp +++ b/mozilla/netwerk/protocol/about/src/nsAboutCacheEntry.cpp @@ -68,7 +68,8 @@ nsAboutCacheEntry::NewChannel(nsIURI *aURI, nsIChannel **result) nsCOMPtr chan; rv = NS_NewInputStreamChannel(getter_AddRefs(chan), aURI, nsnull, - NS_LITERAL_CSTRING("application/xhtml+xml")); + NS_LITERAL_CSTRING("application/xhtml+xml"), + NS_LITERAL_CSTRING("utf-8")); if (NS_FAILED(rv)) return rv; mStreamChannel = do_QueryInterface(chan, &rv); @@ -476,7 +477,7 @@ nsAboutCacheEntry::WriteCacheEntryDescription(nsIOutputStream *outputStream, if (NS_SUCCEEDED(rv)) { nsAutoString filePath; cacheFile->GetPath(filePath); - APPEND_ROW("file on disk", NS_ConvertUCS2toUTF8(filePath)); + APPEND_ROW("file on disk", NS_ConvertUTF16toUTF8(filePath)); } else APPEND_ROW("file on disk", "none");