summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | | | | | | am 39ad9f56: Merge "Defer closing idle sockets." into ics-mr1Selim Gurun2011-11-173-4/+132
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '39ad9f5657323d3852f6741c79b830019baba4a8': Defer closing idle sockets.
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Defer closing idle sockets." into ics-mr1Selim Gurun2011-11-173-4/+132
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | Defer closing idle sockets.Selim Gurun2011-11-173-4/+132
| | |/ / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5523884 backport changes from chrome to defer closing idle sockets until next socket request (for power efficiency). This does not enable persistent connections. Change-Id: Iab82f546e8607ddc4cacc576cda52c4d2d536570
* | | | | | | | | | | | | | | | | | | | | | | | | | am efe273f2: Part of fix for bug 5523834, backporting cache fixesKristian Monsen2011-11-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'efe273f2861c2ea723aa1f9edd20a73356da2b6b': Part of fix for bug 5523834, backporting cache fixes
| * | | | | | | | | | | | | | | | | | | | | | | | | Part of fix for bug 5523834, backporting cache fixesKristian Monsen2011-11-1510-61/+187
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is hopefully a fix for bug 5255299 Cherry-picking CL http://src.chromium.org/viewvc/chrome?view=rev&revision=103323 Did not cherry-pick the changes in trunk/src/net/disk_cache/backend_unittest.cc as we are not running the tests on Android. Change-Id: I765b72d7c9e93e2a87aa5ad84ad62ca6ab38eac0
* | | | | | | | | | | | | | | | | | | | | | | | | am 1ab02c36: (-s ours) Part of fix for bug 5523834, backporting cache fixesKristian Monsen2011-11-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1ab02c36bee95e85558f6815b2836e9ee6a26b19': Part of fix for bug 5523834, backporting cache fixes
| * | | | | | | | | | | | | | | | | | | | | | | | Part of fix for bug 5523834, backporting cache fixesKristian Monsen2011-11-154-12/+65
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is hopefully a fix for bug 5255299 Cherry-picking CL http://src.chromium.org/viewvc/chrome?view=rev&revision=93059 Change-Id: I2295cb29dc4ac1f97ceb492ea77a205a2b5c7a05
* | | | | | | | | | | | | | | | | | | | | | | | am 93bed14e: Part of fix for bug 5523834, backporting cache fixesKristian Monsen2011-11-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '93bed14e13dd5a6dd3d68bcf6d3c7c1f691f669b': Part of fix for bug 5523834, backporting cache fixes
| * | | | | | | | | | | | | | | | | | | | | | | Part of fix for bug 5523834, backporting cache fixesKristian Monsen2011-11-156-5/+39
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is hopefully a fix for bug 5255299 Cherry-picking CL http://src.chromium.org/viewvc/chrome?view=rev&revision=92390 Change-Id: I2f9905bf2f53dd958eb17d1af789fcfb35224061
* | | | | | | | | | | | | | | | | | | | | | | am a972e26e: (-s ours) Part of fix for bug 5523834, backporting cache fixesKristian Monsen2011-11-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a972e26e14066ec50afdaf4582836fe5fc4c190a': Part of fix for bug 5523834, backporting cache fixes
| * | | | | | | | | | | | | | | | | | | | | | Part of fix for bug 5523834, backporting cache fixesKristian Monsen2011-11-154-22/+56
| |/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is hopefully a fix for bug 5255299 Cherry-picking CL http://src.chromium.org/viewvc/chrome?view=rev&revision=84877 Change-Id: Ie38ecab599eb0d1bdb8a77efd7dd7f416ef26701
* | | | | | | | | | | | | | | | | | | | | | am 2c4085b2: Backport SPDY ping changes from chrome 16.Selim Gurun2011-11-1116-62/+1252
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2c4085b2006233b5e3a3fe507d62642377b5dc2e': Backport SPDY ping changes from chrome 16.
| * | | | | | | | | | | | | | | | | | | | | Backport SPDY ping changes from chrome 16.Selim Gurun2011-11-1016-62/+1252
| |/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5524112 Backported Chrome 16 changes for SPDY Ping. The Chrome changes are: http://codereview.chromium.org/8036016 http://codereview.chromium.org/8230037 http://codereview.chromium.org/8319015 http://codereview.chromium.org/8330002 Also enable the SPDY protocol. Change-Id: I2c25c19135ec1c75361d51fdbfbbbbb19f0a3098 Signed-off-by: Selim Gurun <sgurun@google.com>
* | | | | | | | | | | | | | | | | | | | | Part of fix for bug 5584571 Add HTTP request header with app nameKristian Monsen2011-11-091-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-picking net/url_request/url_request.cc part of: http://codereview.chromium.org/7647028 Needed to add more headers to request by name. Change-Id: I102d7aa4f8cf4c9e77a55fb4f3bf2294390089c5
* | | | | | | | | | | | | | | | | | | | | Part of fix for bug 5523834, backporting cache fixesKristian Monsen2011-11-0210-61/+187
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-picking CL http://src.chromium.org/viewvc/chrome?view=rev&revision=103323 Did not cherry-pick the changes in trunk/src/net/disk_cache/backend_unittest.cc as we are not running the tests on Android. Change-Id: I4e04bf061bdb6746030f3a93501cff9b384c58df
* | | | | | | | | | | | | | | | | | | | | Part of fix for bug 5523834, backporting cache fixesKristian Monsen2011-11-014-12/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-picking CL http://src.chromium.org/viewvc/chrome?view=rev&revision=93059 Change-Id: I2e68fa722b65bd107846b6c8e84112844386bd94
* | | | | | | | | | | | | | | | | | | | | Part of fix for bug 5523834, backporting cache fixesKristian Monsen2011-11-016-5/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-picking CL http://src.chromium.org/viewvc/chrome?view=rev&revision=92390 Change-Id: I77f8cbd61c90e90ca437fd73bf10afa29e606d7f
* | | | | | | | | | | | | | | | | | | | | Part of fix for bug 5523834, backporting cache fixesKristian Monsen2011-11-014-22/+56
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-picking CL http://src.chromium.org/viewvc/chrome?view=rev&revision=84877 Change-Id: Iaaa408fbf4375570e5d8bbb59314f8bedc7393a1
* | | | | | | | | | | | | | | | | | | | Merge "fix for bug 5454586, fix up getDbThread()"Kristian Monsen2011-10-251-41/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | fix for bug 5454586, fix up getDbThread()Kristian Monsen2011-10-241-41/+14
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creating a LazyInstance and removing getter function, just using the object that should now be thread safe. Minor indenting change. Change-Id: I9deca3f10d96fdaf655a28b8f4d8db8efdc1803a
* | | | | | | | | | | | | | | | | | | Fix for build breakKristian Monsen2011-10-241-2/+3
|/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Export needed function for SPDY support Change-Id: I2a6c819d79dbc9dcf2e12eb41072cc0245954200
* | | | | | | | | | | | | | | | | | Part of fix for bug 5455901 Fix makefile, turn off exporting everythingKristian Monsen2011-10-211-3/+3
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Final fix, turn off exporting everything in the makefile, and add needed defines Change-Id: Id0ed1eefa375462a9023ff22ea692631d8477a93
* | | | | | | | | | | | | | | | | Part of fix for bug 5455901 Export symbols from baseKristian Monsen2011-10-215-11/+36
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some are upstream, others guarded with #ifdef ANDROID are not Change-Id: I8615feafc0ad088d237794acdace655d9f842c12
* | | | | | | | | | | | | | | | Part of fix for bug 5455901 Add exports needed for autofill and cookiesKristian Monsen2011-10-217-8/+61
| |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Local only exports due to using of autofill and cookies outside chromium. All changes marked with #ifdef ANDROID Change-Id: I72dcd7fe0fe546073c271663123ba17469deaa83
* | | | | | | | | | | | | | | Part of fix for bug 5455901 Export symbols from net/Kristian Monsen2011-10-2129-55/+94
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exporting needed symbols for linking libwebcore and libstagefright. Everything here is cherrypicks from upstream, but only taking the definitions we need to satisfy linker errors. One exception is in openssl_private_key_store.h, which because of this uses an android guard. Change-Id: I74a8f2bfd63a83c2c1684ba955fcdf00bcb2666a
* | | | | | | | | | | | | | Part of fix for bug 5455901 Export symbols in android/Kristian Monsen2011-10-213-3/+6
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exporting needed symbols from Android specific code. Used NET_EXPORT for net code and BASE_API for other code. Change-Id: Ief7426180eec993bbe894e7231b224dcac657c7b
* | | | | | | | | | | | | Part of fix for bug 5455901 adding net_export.hKristian Monsen2011-10-211-0/+34
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding net/base/net_export as it is in ToT chromium. Change-Id: Ia6e36b981854b26cf4ccdb315941dfb05aea0ff4
* | | | | | | | | | | | Remove temporary debug loggingSteve Block2011-10-193-74/+0
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a cherry-pick of https://android-git.corp.google.com/g/#/c/141900, which went into ics-mr0 only. Bug: 5454995 Change-Id: I970b59f6da4890d0b89566ffa1909c33707f9506
* | | | | | | | | | | am c0c5e0fc: Fix SQLitePersistentCookieStore\'s getDbThread() to be threadsafeSteve Block2011-10-141-12/+26
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c0c5e0fca18f5a0912fdba1bd5c5ca2ad0c2693c': Fix SQLitePersistentCookieStore's getDbThread() to be threadsafe
| * | | | | | | | | | Fix SQLitePersistentCookieStore's getDbThread() to be threadsafeSteve Block2011-10-141-12/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an updated version of https://android-git.corp.google.com/g/#/c/141899, which was rolled out, with the lock now static and moved to file scope to match Chromium style. Bug: 5244039 Change-Id: Ic6a6e949b2adc8cf433e6468c1f84ed449af09bc
* | | | | | | | | | | am df5ec85c: Merge "Causing webviews to hang." into ics-mr0Chris Craik2011-10-131-21/+12
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | / | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | * commit 'df5ec85c1f7d3b444e458a4652302aca23624cc1': Causing webviews to hang.
| * | | | | | | | | Merge "Causing webviews to hang." into ics-mr0Chris Craik2011-10-131-21/+12
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Causing webviews to hang.Chris Craik2011-10-131-21/+12
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Fix SQLitePersistentCookieStore's getDbThread() to be threadsafe" This reverts commit 47f5154a4217fb3626326224fc1c7d3c9918dd09
* | | | | | | | | | am 08712c35: (-s ours) Remove temporary debug logging - DO NOT MERGESteve Block2011-10-130-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | / / / / / / / / | |/ / / / / / / / |/| | | | | | | | * commit '08712c353f0e36ed1c0fd55ff369ca899d1bc9c5': Remove temporary debug logging - DO NOT MERGE
| * | | | | | | | Remove temporary debug logging - DO NOT MERGESteve Block2011-10-133-74/+0
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5244039 Change-Id: Ia383537b83933da362f4c7c7eba4b4886bce4ed5
* | | | | | | | Fix SQLitePersistentCookieStore's getDbThread() to be threadsafeSteve Block2011-10-131-12/+21
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5244039 Change-Id: I2d4f66b2f5e64c2cab247574cdfd8fa2d707cad8
* | | | | | | More logging in Thread to help debuggingSteve Block2011-10-102-15/+43
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a check for multiple overlapping calls to StartWithOptions() Bug: 5244039 Change-Id: Ic89b94309126cc53320c3e7973c0eea0d88fd9c4
* | | | | | Add more logging to Thread and WaitableEvent to help debuggingSteve Block2011-10-072-0/+36
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | Bug: 5244039 Change-Id: I385642faf33ec9f3875cfd035c9500e7342ca17d
* | | | | Use notable values when clearing Thread::startup_data_ to help with debuggingSteve Block2011-09-301-0/+10
| |_|_|/ |/| | | | | | | | | | | | | | | Bug: 5244039 Change-Id: I2f91ceb69c140b70b550eda83aa6bbafc95631f2
* | | | Reapply: Fix for bug 5226268 [Browser] http keep-aliveKristian Monsen2011-09-192-0/+11
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Disabling connection reuse so we can disable keep-alives. Needs a CL from external/webkit: https://android-git.corp.google.com/g/#/c/135470/ Change-Id: I441682ee20f4b2ead8f0b0c945257ab56b607acf
* | | Reconcile with ics-factoryrom-releaseThe Android Open Source Project2011-09-190-0/+0
|\ \ \ | |_|/ |/| | | | | Change-Id: Iea480d23d42400ddb693da5615c64c7d37997c29
| * | Fix for bug 5226268 [Browser] http keep-alive DO NOT MERGEKristian Monsen2011-09-182-0/+11
| |/ | | | | | | | | | | | | | | | | Disabling connection reuse so we can disable keep-alives. Needs a CL from external/webkit: https://android-git.corp.google.com/g/#/c/135470/ Change-Id: If8cdfb2c1686d8c971f6025b1e9ae75f57dd7f16
* | am c391e782: (-s ours) Fix for bug 5226268 [Browser] http keep-alive DO NOT ↵Kristian Monsen2011-09-180-0/+0
|\ \ | |/ |/| | | | | | | | | MERGE * commit 'c391e78224fccd37c5d3d7f90309a86b8f384793': Fix for bug 5226268 [Browser] http keep-alive DO NOT MERGE
| * Fix for bug 5226268 [Browser] http keep-alive DO NOT MERGEKristian Monsen2011-09-182-0/+11
|/ | | | | | | | | Disabling connection reuse so we can disable keep-alives. Needs a CL from external/webkit: https://android-git.corp.google.com/g/#/c/135470/ Change-Id: If8cdfb2c1686d8c971f6025b1e9ae75f57dd7f16
* Fix for bug 4487538 Current DrainKristian Monsen2011-09-084-0/+24
| | | | | | | | | Closing idle connections when timers are paused. Cherry-picking from: http://codereview.chromium.org/7380004/ Change-Id: Ief5de0ec6665c6cd27f3bb2639297675f44fa28d
* Merge "external/chromium: Handle SSL proxy case for UID tracking. ↵Ashish Sharma2011-09-061-1/+11
|\ | | | | | | b/5227671"
| * external/chromium: Handle SSL proxy case for UID tracking.Ashish Sharma2011-09-051-1/+11
| | | | | | | | | | | | b/5227671 Change-Id: I93bf9ca01370f727666e0d83cc442416ed035070
* | Merge "Fix for bug 5232736 Remove "DigiNotar Root CA""Kristian Monsen2011-09-028-10/+326
|\ \
| * | Fix for bug 5232736 Remove "DigiNotar Root CA"Kristian Monsen2011-09-018-10/+326
| |/ | | | | | | | | | | | | | | | | | | Chery pick of: http://src.chromium.org/viewvc/chrome?view=rev&revision=98750 http://codereview.chromium.org/7791032/diff/6001/net/base/x509_certificate.cc This should be it for master. Change-Id: I077b2efb328bda349232cd6e3e3f69e1c5460367
* | Adding method for closing idle connectionsKristian Monsen2011-09-022-0/+11
|/ | | | | | | | | Part of fix for bug 4487538 Current Drain Being worked on upstream in: http://codereview.chromium.org/7380004/ Change-Id: I1b03aef9211e4dd2ad640c6c5b43622a105cbbd8