mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-11 16:32:59 +00:00
Make sure to parse the data as UTF-8, since we serialized it as UTF8. Bug
240717, r+sr=jst
This commit is contained in:
parent
d2904cd7c1
commit
2cff2b7990
@ -86,6 +86,7 @@ public:
|
||||
|
||||
protected:
|
||||
nsCString mContentType;
|
||||
nsCString mContentCharset;
|
||||
nsresult mStatus;
|
||||
PRInt32 mContentLength;
|
||||
nsCOMPtr<nsIURI> mURI;
|
||||
@ -194,12 +195,12 @@ NS_IMETHODIMP nsDOMParserChannel::SetContentType(const nsACString &aContentType)
|
||||
/* attribute ACString contentCharset; */
|
||||
NS_IMETHODIMP nsDOMParserChannel::GetContentCharset(nsACString &aContentCharset)
|
||||
{
|
||||
aContentCharset.Truncate();
|
||||
aContentCharset = mContentCharset;
|
||||
return NS_OK;
|
||||
}
|
||||
NS_IMETHODIMP nsDOMParserChannel::SetContentCharset(const nsACString &aContentCharset)
|
||||
{
|
||||
return NS_ERROR_NOT_IMPLEMENTED;
|
||||
mContentCharset = aContentCharset;
|
||||
}
|
||||
|
||||
/* attribute long contentLength; */
|
||||
@ -547,6 +548,7 @@ nsDOMParser::ParseFromStream(nsIInputStream *stream,
|
||||
if (principal) {
|
||||
channel->SetOwner(principal);
|
||||
}
|
||||
parserChannel->SetContentCharset(nsDependentCString(charset));
|
||||
nsCOMPtr<nsIRequest> request = NS_STATIC_CAST(nsIRequest*, parserChannel);
|
||||
|
||||
// Tell the document to start loading
|
||||
|
Loading…
Reference in New Issue
Block a user