Clean up HttpResponseHeaders::IsKeepAlive. Use the...

net/http/http_response_headers.cc

 // Copyright (c) 2006-2008 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 906 matching lines @@
                                               Time* result) const {
   std::string value;
   if (!EnumerateHeader(NULL, name, &value))
     return false;
 
   std::wstring value_wide(value.begin(), value.end());  // inflate ascii
   return Time::FromString(value_wide.c_str(), result);
 }
 
 bool HttpResponseHeaders::IsKeepAlive() const {
-  const char kPrefix[] = "HTTP/1.0";
-  const size_t kPrefixLen = arraysize(kPrefix) - 1;
-  if (raw_headers_.size() < kPrefixLen)  // Lacking a status line?
+  if (http_version_ < HttpVersion(1, 0))
     return false;
 
   // NOTE: It is perhaps risky to assume that a Proxy-Connection header is
   // meaningful when we don't know that this response was from a proxy, but
   // Mozilla also does this, so we'll do the same.
   std::string connection_val;
-  void* iter = NULL;
-  if (!EnumerateHeader(&iter, "connection", &connection_val))
-    EnumerateHeader(&iter, "proxy-connection", &connection_val);
+  if (!EnumerateHeader(NULL, "connection", &connection_val))
+    EnumerateHeader(NULL, "proxy-connection", &connection_val);
 
   bool keep_alive;
 
-  if (std::equal(raw_headers_.begin(),
-                 raw_headers_.begin() + kPrefixLen, kPrefix)) {
+  if (http_version_ == HttpVersion(1, 0)) {
     // HTTP/1.0 responses default to NOT keep-alive
     keep_alive = LowerCaseEqualsASCII(connection_val, "keep-alive");
   } else {
     // HTTP/1.1 responses default to keep-alive
     keep_alive = !LowerCaseEqualsASCII(connection_val, "close");
   }
 
   return keep_alive;
 }
 
@@ skipping 14 matching lines @@
   int64 result;
   bool ok = StringToInt64(content_length_val, &result);
   if (!ok || result < 0)
     return -1;
 
   return result;
 }
 
 }  // namespace net