diff options
author | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-23 16:29:05 +0000 |
---|---|---|
committer | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-23 16:29:05 +0000 |
commit | 6e13b1df93d706045f2da60a61ffebda047385ce (patch) | |
tree | f1d5803b278cfcfe08ce12328a50d711cfbe71e7 /net/http/http_response_headers.cc | |
parent | 3285544e4190d671613e871ca27341268d0776a5 (diff) | |
download | chromium_src-6e13b1df93d706045f2da60a61ffebda047385ce.zip chromium_src-6e13b1df93d706045f2da60a61ffebda047385ce.tar.gz chromium_src-6e13b1df93d706045f2da60a61ffebda047385ce.tar.bz2 |
HttpVersion had to be changed because glibc defines macros named "major" and "minor" which was causing compilation problems.
Patch contributed by James Vega <vega.james@gmail.com>.
Note: Took the leasure to make some globals const.
Review URL: http://codereview.chromium.org/4217
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2491 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_response_headers.cc')
-rw-r--r-- | net/http/http_response_headers.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/http/http_response_headers.cc b/net/http/http_response_headers.cc index 604a522..8dca8a7 100644 --- a/net/http/http_response_headers.cc +++ b/net/http/http_response_headers.cc @@ -28,7 +28,7 @@ namespace { // These response headers are not persisted in a cached representation of the // response headers. (This list comes from Mozilla's nsHttpResponseHead.cpp) -const char* kTransientHeaders[] = { +const char* const kTransientHeaders[] = { "connection", "proxy-connection", "keep-alive", @@ -43,7 +43,7 @@ const char* kTransientHeaders[] = { // These respones headers are not copied from a 304/206 response to the cached // response headers. This list is based on Mozilla's nsHttpResponseHead.cpp. -const char* kNonUpdatedHeaders[] = { +const char* const kNonUpdatedHeaders[] = { "connection", "proxy-connection", "keep-alive", @@ -453,8 +453,8 @@ void HttpResponseHeaders::ParseStatusLine(string::const_iterator line_begin, raw_headers_ = "HTTP/1.0"; } if (parsed_http_version_ != http_version_) { - DLOG(INFO) << "assuming HTTP/" << http_version_.major() << "." - << http_version_.minor(); + DLOG(INFO) << "assuming HTTP/" << http_version_.major_value() << "." + << http_version_.minor_value(); } // TODO(eroman): this doesn't make sense if ParseVersion failed. |