Revert of HttpServer: avoid DCHECK'ing on non-HTTP/1.1 requests.

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 609 matching lines @@
 }
 
 HttpResponseHeaders::HttpResponseHeaders() : response_code_(-1) {
 }
 
 HttpResponseHeaders::~HttpResponseHeaders() {
 }
 
 // Note: this implementation implicitly assumes that line_end points at a valid
 // sentinel character (such as '\0').
+// static
+HttpVersion HttpResponseHeaders::ParseVersion(
+    std::string::const_iterator line_begin,
+    std::string::const_iterator line_end) {
+  std::string::const_iterator p = line_begin;
+
+  // RFC2616 sec 3.1: HTTP-Version   = "HTTP" "/" 1*DIGIT "." 1*DIGIT
+  // TODO: (1*DIGIT apparently means one or more digits, but we only handle 1).
+  // TODO: handle leading zeros, which is allowed by the rfc1616 sec 3.1.
+
+  if ((line_end - p < 4) || !LowerCaseEqualsASCII(p, p + 4, "http")) {
+    DVLOG(1) << "missing status line";
+    return HttpVersion();
+  }
+
+  p += 4;
+
+  if (p >= line_end || *p != '/') {
+    DVLOG(1) << "missing version";
+    return HttpVersion();
+  }
+
+  std::string::const_iterator dot = std::find(p, line_end, '.');
+  if (dot == line_end) {
+    DVLOG(1) << "malformed version";
+    return HttpVersion();
+  }
+
+  ++p;  // from / to first digit.
+  ++dot;  // from . to second digit.
+
+  if (!(*p >= '0' && *p <= '9' && *dot >= '0' && *dot <= '9')) {
+    DVLOG(1) << "malformed version number";
+    return HttpVersion();
+  }
+
+  uint16 major = *p - '0';
+  uint16 minor = *dot - '0';
+
+  return HttpVersion(major, minor);
+}
+
+// Note: this implementation implicitly assumes that line_end points at a valid
+// sentinel character (such as '\0').
 void HttpResponseHeaders::ParseStatusLine(
     std::string::const_iterator line_begin,
     std::string::const_iterator line_end,
     bool has_headers) {
   // Extract the version number
-  std::string::const_iterator first_space =
-      std::find(line_begin, line_end, ' ');
-  std::string version(line_begin, first_space);
-  bool success = HttpUtil::ParseVersion(version, &parsed_http_version_);
+  parsed_http_version_ = ParseVersion(line_begin, line_end);
 
   // Clamp the version number to one of: {0.9, 1.0, 1.1}
-  if (success && parsed_http_version_ == HttpVersion(0, 9) && !has_headers) {
+  if (parsed_http_version_ == HttpVersion(0, 9) && !has_headers) {
     http_version_ = HttpVersion(0, 9);
     raw_headers_ = "HTTP/0.9";
-  } else if (success && parsed_http_version_ >= HttpVersion(1, 1)) {
+  } else if (parsed_http_version_ >= HttpVersion(1, 1)) {
     http_version_ = HttpVersion(1, 1);
     raw_headers_ = "HTTP/1.1";
   } else {
     // Treat everything else like HTTP 1.0
     http_version_ = HttpVersion(1, 0);
     raw_headers_ = "HTTP/1.0";
   }
   if (parsed_http_version_ != http_version_) {
     DVLOG(1) << "assuming HTTP/" << http_version_.major_value() << "."
              << http_version_.minor_value();
   }
 
   // TODO(eroman): this doesn't make sense if ParseVersion failed.
-  std::string::const_iterator p = first_space;
+  std::string::const_iterator p = std::find(line_begin, line_end, ' ');
 
   if (p == line_end) {
     DVLOG(1) << "missing response status; assuming 200 OK";
     raw_headers_.append(" 200 OK");
     response_code_ = 200;
     return;
   }
 
   // Skip whitespace.
   while (*p == ' ')
@@ skipping 787 matching lines @@
     // should not generate representation metadata other than Cache-Control,
     // Content-Location, Date, ETag, Expires, and Vary.
     return ProxyService::MISSING_VIA_HEADER;
   }
   // There is no bypass event.
   return ProxyService::BYPASS_EVENT_TYPE_MAX;
 }
 #endif  // defined(SPDY_PROXY_AUTH_ORIGIN)
 
 }  // namespace net