Delete net::GetHeaderParamValue

net/http/http_util.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // The rules for parsing content-types were borrowed from Firefox:
 // http://lxr.mozilla.org/mozilla/source/netwerk/base/src/nsURLHelper.cpp#834
 
 #include "net/http/http_util.h"
 
 #include <algorithm>
@@ skipping 72 matching lines @@
     // string, so just go back to the top of the loop and look for
     // |delimiter| again.
   } while (true);
 
   NOTREACHED();
   return line.length();
 }
 
 // static
 void HttpUtil::ParseContentType(const string& content_type_str,
-                                string* mime_type, string* charset,
-                                bool *had_charset) {
+                                string* mime_type,
+                                string* charset,
+                                bool *had_charset,
+                                string* boundary) {
+  const string::const_iterator begin = content_type_str.begin();
+
   // Trim leading and trailing whitespace from type.  We include '(' in
   // the trailing trim set to catch media-type comments, which are not at all
   // standard, but may occur in rare cases.
   size_t type_val = content_type_str.find_first_not_of(HTTP_LWS);
   type_val = std::min(type_val, content_type_str.length());
   size_t type_end = content_type_str.find_first_of(HTTP_LWS ";(", type_val);
   if (string::npos == type_end)
     type_end = content_type_str.length();
 
   size_t charset_val = 0;
   size_t charset_end = 0;
 
   // Iterate over parameters
   bool type_has_charset = false;
   size_t param_start = content_type_str.find_first_of(';', type_end);
   if (param_start != string::npos) {
     // We have parameters.  Iterate over them.
     size_t cur_param_start = param_start + 1;
     do {
       size_t cur_param_end =
           FindDelimiter(content_type_str, cur_param_start, ';');
 
       size_t param_name_start = content_type_str.find_first_not_of(
           HTTP_LWS, cur_param_start);
       param_name_start = std::min(param_name_start, cur_param_end);
 
       static const char charset_str[] = "charset=";
       size_t charset_end_offset = std::min(
           param_name_start + sizeof(charset_str) - 1, cur_param_end);
-      if (LowerCaseEqualsASCII(
-              content_type_str.begin() + param_name_start,
-              content_type_str.begin() + charset_end_offset, charset_str)) {
+      if (LowerCaseEqualsASCII(begin + param_name_start,
+                               begin + charset_end_offset,
+                               charset_str)) {
         charset_val = param_name_start + sizeof(charset_str) - 1;
         charset_end = cur_param_end;
         type_has_charset = true;
       }
 
+      static const char boundary_str[] = "boundary=";

[asanka, 2012/01/27 16:18:59]

Isn't *LWSP-char allowed around "="?

GetHeaderParamValue() allowed LWSP-char around symbols.  I wonder if we would
break things that expect this to be the case.

+      static const size_t boundary_len = sizeof(boundary_str) - 1;
+      size_t boundary_end_offset = std::min(
+          param_name_start + boundary_len, cur_param_end);
+      if (boundary && LowerCaseEqualsASCII(begin + param_name_start,
+                                           begin + boundary_end_offset,
+                                           boundary_str)) {
+        string::const_iterator boundary_begin =
+            begin + param_name_start + boundary_len;
+        string::const_iterator boundary_end = begin + cur_param_end;
+        TrimLWS(&boundary_begin, &boundary_end);
+        boundary->assign(boundary_begin, boundary_end);
+      }
+
       cur_param_start = cur_param_end + 1;
     } while (cur_param_start < content_type_str.length());
   }
 
   if (type_has_charset) {
     // Trim leading and trailing whitespace from charset_val.  We include
     // '(' in the trailing trim set to catch media-type comments, which are
     // not at all standard, but may occur in rare cases.
     charset_val = content_type_str.find_first_not_of(HTTP_LWS, charset_val);
     charset_val = std::min(charset_val, charset_end);
@@ skipping 13 matching lines @@
   // also, if type_val is the same as mime_type, then just update the
   // charset.  however, if charset is empty and mime_type hasn't
   // changed, then don't wipe-out an existing charset.  We
   // also want to reject a mime-type if it does not include a slash.
   // some servers give junk after the charset parameter, which may
   // include a comma, so this check makes us a bit more tolerant.
   if (content_type_str.length() != 0 &&
       content_type_str != "*/*" &&
       content_type_str.find_first_of('/') != string::npos) {
     // Common case here is that mime_type is empty
-    bool eq = !mime_type->empty() &&
-              LowerCaseEqualsASCII(content_type_str.begin() + type_val,
-                                   content_type_str.begin() + type_end,
-                                   mime_type->data());
+    bool eq = !mime_type->empty() && LowerCaseEqualsASCII(begin + type_val,
+                                                          begin + type_end,
+                                                          mime_type->data());
     if (!eq) {
-      mime_type->assign(content_type_str.begin() + type_val,
-                        content_type_str.begin() + type_end);
+      mime_type->assign(begin + type_val, begin + type_end);
       StringToLowerASCII(mime_type);
     }
     if ((!eq && *had_charset) || type_has_charset) {
       *had_charset = true;
-      charset->assign(content_type_str.begin() + charset_val,
-                      content_type_str.begin() + charset_end);
+      charset->assign(begin + charset_val, begin + charset_end);
       StringToLowerASCII(charset);
     }
   }
 }
 
 // static
 // Parse the Range header according to RFC 2616 14.35.1
 // ranges-specifier = byte-ranges-specifier
 // byte-ranges-specifier = bytes-unit "=" byte-range-set
 // byte-range-set  = 1#( byte-range-spec | suffix-byte-range-spec )
@@ skipping 646 matching lines @@
       value_is_quoted_ = true;
       // Do not store iterators into this. See declaration of unquoted_value_.
       unquoted_value_ = HttpUtil::Unquote(value_begin_, value_end_);
     }
   }
 
   return true;
 }
 
 }  // namespace net