diff options
| author | Selim Gurun <sgurun@google.com> | 2011-11-17 11:32:47 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-17 11:32:47 -0800 |
| commit | ccec64d1f91dab09f7e3c6b9d6559e72aa4b46c7 (patch) | |
| tree | 11cb218dd431ce1608d588ec03b809f680ce36cd | |
| parent | fdfa15584bef3f6b04e2999b483d3a4c13102072 (diff) | |
| parent | 361bc379144f4e67bca8b263c7a673fa73aafefc (diff) | |
| download | external_chromium-ccec64d1f91dab09f7e3c6b9d6559e72aa4b46c7.zip external_chromium-ccec64d1f91dab09f7e3c6b9d6559e72aa4b46c7.tar.gz external_chromium-ccec64d1f91dab09f7e3c6b9d6559e72aa4b46c7.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.cc | 6 |
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() { |