summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorSelim Gurun <sgurun@google.com>2011-11-17 11:31:44 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-11-17 11:31:44 -0800
commit361bc379144f4e67bca8b263c7a673fa73aafefc (patch)
tree11cb218dd431ce1608d588ec03b809f680ce36cd /net
parent39ad9f5657323d3852f6741c79b830019baba4a8 (diff)
parentf5b478bbe82e8c35486a2e2ec5cabdd8b7f3fc0f (diff)
downloadexternal_chromium-361bc379144f4e67bca8b263c7a673fa73aafefc.zip
external_chromium-361bc379144f4e67bca8b263c7a673fa73aafefc.tar.gz
external_chromium-361bc379144f4e67bca8b263c7a673fa73aafefc.tar.bz2
Merge "Enable persistent http connections." into ics-mr1
Diffstat (limited to 'net')
-rw-r--r--net/http/http_basic_stream.cc6
1 files changed, 0 insertions, 6 deletions
diff --git a/net/http/http_basic_stream.cc b/net/http/http_basic_stream.cc
index 076d18f..6501a59 100644
--- a/net/http/http_basic_stream.cc
+++ b/net/http/http_basic_stream.cc
@@ -72,13 +72,7 @@ int HttpBasicStream::ReadResponseBody(IOBuffer* buf, int buf_len,
}
void HttpBasicStream::Close(bool not_reusable) {
-#ifdef ANDROID
- // Disable connection reuse for bug 5226268
- // [Browser] http keep-alive packets are sent too frequently to network
- parser_->Close(true);
-#else
parser_->Close(not_reusable);
-#endif
}
HttpStream* HttpBasicStream::RenewStreamForAuth() {