| Index: webkit/glue/weburlloader_impl.cc
|
| ===================================================================
|
| --- webkit/glue/weburlloader_impl.cc (revision 119390)
|
| +++ webkit/glue/weburlloader_impl.cc (working copy)
|
| @@ -19,6 +19,7 @@
|
| #include "net/base/net_errors.h"
|
| #include "net/base/net_util.h"
|
| #include "net/http/http_response_headers.h"
|
| +#include "net/http/http_util.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebHTTPHeaderVisitor.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebHTTPLoadInfo.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h"
|
| @@ -561,8 +562,12 @@
|
| std::string content_type;
|
| info.headers->EnumerateHeader(NULL, "content-type", &content_type);
|
|
|
| - std::string boundary = net::GetHeaderParamValue(
|
| - content_type, "boundary", net::QuoteRule::REMOVE_OUTER_QUOTES);
|
| + std::string mime_type;
|
| + std::string charset;
|
| + bool had_charset;
|
| + std::string boundary;
|
| + net::HttpUtil::ParseContentType(content_type, &mime_type, &charset,
|
| + &had_charset, &boundary);
|
| TrimString(boundary, " \"", &boundary);
|
|
|
| // If there's no boundary, just handle the request normally. In the gecko
|
|
|