From 984eb760cc2aec20a4607250a48d2d10a2f2309c Mon Sep 17 00:00:00 2001 From: "shanjian%netscape.com" Date: Fri, 20 Sep 2002 09:24:54 +0000 Subject: [PATCH] #169858 Browser--Can not login CMB website. Populate frameset charset source of post doc to disable autodetection. r=jkeiser, jebak, sr=jst. git-svn-id: svn://10.0.0.236/trunk@130139 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/html/document/src/nsHTMLDocument.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mozilla/content/html/document/src/nsHTMLDocument.cpp b/mozilla/content/html/document/src/nsHTMLDocument.cpp index 1f2b255981c..4829196330d 100644 --- a/mozilla/content/html/document/src/nsHTMLDocument.cpp +++ b/mozilla/content/html/document/src/nsHTMLDocument.cpp @@ -628,6 +628,9 @@ nsHTMLDocument::TryParentCharset(nsIDocumentCharsetInfo* aDocInfo, aDocInfo->GetParentCharsetSource(&parentSource); if (kCharsetFromParentForced <= parentSource) source = kCharsetFromParentForced; + else if (kCharsetFromHintPrevDoc == parentSource) + // if parent is posted doc, set this prevent autodections + source = kCharsetFromHintPrevDoc; else if (kCharsetFromCache <= parentSource) source = kCharsetFromParentFrame; else