From c4221b5e57943896e902fca78e742777df9bc2e1 Mon Sep 17 00:00:00 2001
From: Hector Chu <hectorchu@gmail.com>
Date: Mon, 22 Jun 2009 14:17:20 -0400
Subject: [PATCH] Bug 498875.  nsEmbedStream::OpenStream fails if content type
 includes charset. r=bzbarsky, sr=biesi

---
 embedding/browser/webBrowser/nsEmbedStream.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/embedding/browser/webBrowser/nsEmbedStream.cpp b/embedding/browser/webBrowser/nsEmbedStream.cpp
index ffedbf54b77..213fc42c685 100644
--- a/embedding/browser/webBrowser/nsEmbedStream.cpp
+++ b/embedding/browser/webBrowser/nsEmbedStream.cpp
@@ -132,7 +132,10 @@ nsEmbedStream::OpenStream(nsIURI *aBaseURI, const nsACString& aContentType)
 
   // find a document loader for this content type
 
-  const nsCString& flatContentType = PromiseFlatCString(aContentType);
+  nsCString flatContentType;
+  rv = mChannel->GetContentType(flatContentType);
+  if (NS_FAILED(rv))
+    return rv;
 
   nsXPIDLCString docLoaderContractID;
   nsCOMPtr<nsICategoryManager> catMan(do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv));