summaryrefslogtreecommitdiffstats
path: root/net/http
diff options
context:
space:
mode:
authorwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-16 16:27:39 +0000
committerwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-16 16:27:39 +0000
commit1ee2ca7e0240d2655e15f8573c9e1c3a89ea4f2c (patch)
tree5087d1c54bd3113472e7d7c1cf8df4e872a786d8 /net/http
parentafe0dc2ef547e872cbe8f13f8b68d5f911da5483 (diff)
downloadchromium_src-1ee2ca7e0240d2655e15f8573c9e1c3a89ea4f2c.zip
chromium_src-1ee2ca7e0240d2655e15f8573c9e1c3a89ea4f2c.tar.gz
chromium_src-1ee2ca7e0240d2655e15f8573c9e1c3a89ea4f2c.tar.bz2
Back out r11684, a temporary change for debugging issue 8325.
R=darin BUG=Issue 8325 Review URL: http://codereview.chromium.org/46074 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11732 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http')
-rw-r--r--net/http/http_response_headers.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/net/http/http_response_headers.cc b/net/http/http_response_headers.cc
index f39d4fe..bc7ac62 100644
--- a/net/http/http_response_headers.cc
+++ b/net/http/http_response_headers.cc
@@ -931,10 +931,8 @@ bool HttpResponseHeaders::IsKeepAlive() const {
// 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;
- // TODO(wtc): A temporary change to look for "proxy-connection" before
- // "connection" for debugging http://crbug.com/8325.
- if (!EnumerateHeader(NULL, "proxy-connection", &connection_val))
- EnumerateHeader(NULL, "connection", &connection_val);
+ if (!EnumerateHeader(NULL, "connection", &connection_val))
+ EnumerateHeader(NULL, "proxy-connection", &connection_val);
bool keep_alive;