Fix removal of headers

net/http/http_response_headers.cc

 // Copyright (c) 2012 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 header parsing were borrowed from Firefox:
 // http://lxr.mozilla.org/seamonkey/source/netwerk/protocol/http/src/nsHttpResponseHead.cpp
 // The rules for parsing content-types were also borrowed from Firefox:
 // http://lxr.mozilla.org/mozilla/source/netwerk/base/src/nsURLHelper.cpp#834
 
 #include "net/http/http_response_headers.h"
@@ skipping 293 matching lines @@
     i = k;
   }
   new_raw_headers.push_back('\0');
 
   // Make this object hold the new data.
   raw_headers_.clear();
   parsed_.clear();
   Parse(new_raw_headers);
 }
 
 void HttpResponseHeaders::MergeWithHeadersWithValue(

[rvargas (doing something else), 2012/07/19 19:11:02]

Please remove this method.

[battre, 2012/07/23 13:31:11]

Good catch. Thanks.

Done.

     const std::string& raw_headers,
     const std::string& header_to_remove_name,
     const std::string& header_to_remove_value) {
   std::string header_to_remove_name_lowercase(header_to_remove_name);
   StringToLowerASCII(&header_to_remove_name_lowercase);
 
   std::string new_raw_headers(raw_headers);
   for (size_t i = 0; i < parsed_.size(); ++i) {
     DCHECK(!parsed_[i].is_continuation());
 
@@ skipping 27 matching lines @@
   std::string new_raw_headers(raw_headers_.c_str());
   new_raw_headers.push_back('\0');
 
   std::string lowercase_name(name);
   StringToLowerASCII(&lowercase_name);
   HeaderSet to_remove;
   to_remove.insert(lowercase_name);
   MergeWithHeaders(new_raw_headers, to_remove);
 }
 
-void HttpResponseHeaders::RemoveHeaderWithValue(const std::string& name,
-                                                const std::string& value) {
+void HttpResponseHeaders::RemoveHeaderLine(const std::string& name,
+                                           const std::string& values) {
+  std::string name_lowercase(name);
+  StringToLowerASCII(&name_lowercase);
+
   // Copy up to the null byte.  This just copies the status line.
   std::string new_raw_headers(raw_headers_.c_str());
   new_raw_headers.push_back('\0');
 
-  MergeWithHeadersWithValue(new_raw_headers, name, value);
+  new_raw_headers.reserve(raw_headers_.size());
+
+  HttpUtil::HeadersIterator headers(

[rvargas (doing something else), 2012/07/19 19:11:02]

Shouldn't this code use EnumerateHeaderLines?

[battre, 2012/07/23 13:31:11]

Done.

+      raw_headers_.begin() + new_raw_headers.size(),
+      raw_headers_.end(),
+      std::string(1, '\0'));
+  while (headers.GetNext()) {
+    std::string old_header_name(headers.name());
+    std::string old_header_values(headers.values());
+    std::string old_header_name_lowercase(name);
+    StringToLowerASCII(&old_header_name_lowercase);
+
+    if (name_lowercase == old_header_name_lowercase &&
+        values == old_header_values)
+      continue;
+
+    new_raw_headers.append(old_header_name);
+    new_raw_headers.push_back(':');
+    new_raw_headers.push_back(' ');
+    new_raw_headers.append(old_header_values);
+    new_raw_headers.push_back('\0');
+  }
+  new_raw_headers.push_back('\0');
+
+  // Make this object hold the new data.
+  raw_headers_.clear();
+  parsed_.clear();
+  Parse(new_raw_headers);
 }
 
 void HttpResponseHeaders::AddHeader(const std::string& header) {
   CheckDoesNotHaveEmbededNulls(header);
   DCHECK_EQ('\0', raw_headers_[raw_headers_.size() - 2]);
   DCHECK_EQ('\0', raw_headers_[raw_headers_.size() - 1]);
   // Don't copy the last null.
   std::string new_raw_headers(raw_headers_, 0, raw_headers_.size() - 1);
   new_raw_headers.append(header);
   new_raw_headers.push_back('\0');
@@ skipping 978 matching lines @@
   return true;
 }
 
 bool HttpResponseHeaders::IsChunkEncoded() const {
   // Ignore spurious chunked responses from HTTP/1.0 servers and proxies.
   return GetHttpVersion() >= HttpVersion(1, 1) &&
       HasHeaderValue("Transfer-Encoding", "chunked");
 }
 
 }  // namespace net