summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSelim Gurun <sgurun@google.com>2011-11-17 15:12:39 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-17 15:12:39 -0800
commit754777ec24185272ad267a324907d384e274b648 (patch)
treeb547141528dfc805f0ecc94027224e24fc7a1558
parent13d6d0652e85d0bee7b5ef9f70df775a85499f7f (diff)
parent361bc379144f4e67bca8b263c7a673fa73aafefc (diff)
downloadexternal_chromium-754777ec24185272ad267a324907d384e274b648.zip
external_chromium-754777ec24185272ad267a324907d384e274b648.tar.gz
external_chromium-754777ec24185272ad267a324907d384e274b648.tar.bz2
am 361bc379: Merge "Enable persistent http connections." into ics-mr1
* commit '361bc379144f4e67bca8b263c7a673fa73aafefc': Enable persistent http connections.
-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() {