Fix parsing of content-types with options (bug 138639). r=bbaetz, sr=darin.

netwerk/base/public/nsNetUtil.h

@@ -812,7 +812,7 @@ NS_ParseContentType(const nsACString &rawContentType,
     // contentCharset is left untouched if not present in rawContentType
     nsACString::const_iterator begin, it, end;
     it = rawContentType.BeginReading(begin);
-    rawContentType.BeginReading(end);
+    rawContentType.EndReading(end);
     if (FindCharInReadable(';', it, end)) {
         contentType = Substring(begin, it);
         // now look for "charset=FOO" and extract "FOO"

netwerk/streamconv/converters/nsMultiMixedConv.cpp

@@ -757,9 +757,6 @@ nsMultiMixedConv::SendStart(nsIChannel *aChannel) {
     rv = mPartChannel->SetContentType(mContentType);
     if (NS_FAILED(rv)) return rv;
 
-    rv = mPartChannel->SetContentCharset(mContentCharset);
-    if (NS_FAILED(rv)) return rv;
-
     rv = mPartChannel->SetContentLength(mContentLength);
     if (NS_FAILED(rv)) return rv;
 
@@ -909,7 +906,7 @@ nsMultiMixedConv::ParseHeaders(nsIChannel *aChannel, char *&aPtr,
 
             // examine header
             if (headerStr.EqualsIgnoreCase("content-type")) {
-                NS_ParseContentType(headerVal, mContentType, mContentCharset);
+                mContentType = headerVal;
             } else if (headerStr.EqualsIgnoreCase("content-length")) {
                 mContentLength = atoi(headerVal.get());
             } else if (headerStr.EqualsIgnoreCase("content-disposition")) {

netwerk/streamconv/converters/nsMultiMixedConv.h

@@ -123,7 +123,6 @@ protected:
                                         // one channel per part.
     nsCOMPtr<nsISupports> mContext;
     nsCString           mContentType;
-    nsCString           mContentCharset;
     nsCString           mContentDisposition;
     PRInt32             mContentLength;