summaryrefslogtreecommitdiffstats
path: root/net/http
diff options
context:
space:
mode:
Diffstat (limited to 'net/http')
-rw-r--r--net/http/http_response_headers.cc55
-rw-r--r--net/http/http_response_headers.h8
-rw-r--r--net/http/http_util.cc42
-rw-r--r--net/http/http_util.h6
4 files changed, 55 insertions, 56 deletions
diff --git a/net/http/http_response_headers.cc b/net/http/http_response_headers.cc
index 940c048..4e18056 100644
--- a/net/http/http_response_headers.cc
+++ b/net/http/http_response_headers.cc
@@ -627,62 +627,21 @@ 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
- parsed_http_version_ = ParseVersion(line_begin, line_end);
+ 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_);
// Clamp the version number to one of: {0.9, 1.0, 1.1}
- if (parsed_http_version_ == HttpVersion(0, 9) && !has_headers) {
+ if (success && parsed_http_version_ == HttpVersion(0, 9) && !has_headers) {
http_version_ = HttpVersion(0, 9);
raw_headers_ = "HTTP/0.9";
- } else if (parsed_http_version_ >= HttpVersion(1, 1)) {
+ } else if (success && parsed_http_version_ >= HttpVersion(1, 1)) {
http_version_ = HttpVersion(1, 1);
raw_headers_ = "HTTP/1.1";
} else {
@@ -696,7 +655,7 @@ void HttpResponseHeaders::ParseStatusLine(
}
// TODO(eroman): this doesn't make sense if ParseVersion failed.
- std::string::const_iterator p = std::find(line_begin, line_end, ' ');
+ std::string::const_iterator p = first_space;
if (p == line_end) {
DVLOG(1) << "missing response status; assuming 200 OK";
diff --git a/net/http/http_response_headers.h b/net/http/http_response_headers.h
index 2bf4514..90ba7eb 100644
--- a/net/http/http_response_headers.h
+++ b/net/http/http_response_headers.h
@@ -335,14 +335,6 @@ class NET_EXPORT HttpResponseHeaders
// Initializes from the given raw headers.
void Parse(const std::string& raw_input);
- // Helper function for ParseStatusLine.
- // Tries to extract the "HTTP/X.Y" from a status line formatted like:
- // HTTP/1.1 200 OK
- // with line_begin and end pointing at the begin and end of this line. If the
- // status line is malformed, returns HttpVersion(0,0).
- static HttpVersion ParseVersion(std::string::const_iterator line_begin,
- std::string::const_iterator line_end);
-
// Tries to extract the status line from a header block, given the first
// line of said header block. If the status line is malformed, we'll
// construct a valid one. Example input:
diff --git a/net/http/http_util.cc b/net/http/http_util.cc
index f4f994a..481b104 100644
--- a/net/http/http_util.cc
+++ b/net/http/http_util.cc
@@ -77,6 +77,48 @@ size_t HttpUtil::FindDelimiter(const std::string& line,
}
// static
+bool HttpUtil::ParseVersion(const std::string& version_str,
+ HttpVersion* version) {
+ std::string::const_iterator p = version_str.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 (version_str.length() < 4 || !LowerCaseEqualsASCII(p, p + 4, "http")) {
+ DVLOG(1) << "missing status line";
+ return false;
+ }
+
+ p += 4;
+
+ if (p >= version_str.end() || *p != '/') {
+ DVLOG(1) << "missing version";
+ return false;
+ }
+
+ std::string::const_iterator dot = std::find(p, version_str.end(), '.');
+ if (dot == version_str.end()) {
+ DVLOG(1) << "malformed version";
+ return false;
+ }
+
+ ++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 false;
+ }
+
+ uint16 major = *p - '0';
+ uint16 minor = *dot - '0';
+
+ *version = HttpVersion(major, minor);
+ return true;
+}
+
+// static
void HttpUtil::ParseContentType(const std::string& content_type_str,
std::string* mime_type,
std::string* charset,
diff --git a/net/http/http_util.h b/net/http/http_util.h
index ae65146..5ab27a6 100644
--- a/net/http/http_util.h
+++ b/net/http/http_util.h
@@ -40,6 +40,12 @@ class NET_EXPORT HttpUtil {
size_t search_start,
char delimiter);
+ // Parses an "HTTP/X.Y" version from a string, such as:
+ // "HTTP/1.1"
+ // Returns whether or not the version string was successfully parsed.
+ static bool ParseVersion(const std::string& version_str,
+ HttpVersion* version);
+
// Parses the value of a Content-Type header. The resulting mime_type and
// charset values are normalized to lowercase. The mime_type and charset
// output values are only modified if the content_type_str contains a mime
generated by cgit v1.1 at 2025-05-10 09:38:33 +0000