summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Collapse)AuthorAgeFilesLines
* add tls1_1, tls1_2 settings, remove sslv3 fallback code, disable RC4HEADmasterWolfgang Wiedmeyer2015-09-275-22/+11
| | | | Change-Id: I9ab98fbeb040a4a2a0e8ba3c5e260f61303ed199
* Revert "net: networking optimizations"Ricardo Cerqueira2012-11-1963-3792/+120
| | | | This reverts commit 5fbe95affc8eeed93c678b1d271f64dcc4dd919b.
* Merge branch 'jb-mr1-release' of ↵Steve Kondik2012-11-184-2/+20
|\ | | | | | | https://android.googlesource.com/platform/external/chromium into mr1-staging
| * am 5dfd2805: Merge "Null pointer check missing in chromium"Jean-Baptiste Queru2012-09-051-1/+7
| |\ | | | | | | | | | | | | * commit '5dfd28055043f52c8089d2b26e101de1f66838c8': Null pointer check missing in chromium
| | * Null pointer check missing in chromiumMagnus Hallqvist2012-09-051-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When clearing a struct a null pointer check is missing in one location in chromium. The null check is present in another similar use cases. When the backend cache is reset a member of the struct data_ is set to zero before data_ itself is set to null. If the backend cache previously has been reset data_ will already be null and the member cannot be accessed (or uses undefined memory). The added null check will prevent the clearing of the member variable when data_ is already null. Change-Id: I475fea7436c871c2e82b841a93874e13a05161f4
| * | Disable compression.Selim Gurun2012-08-302-0/+8
| |/ | | | | | | | | | | Bug: 7079965 Change-Id: I6d5ac7d90fc2298b5e8a92cfae1ffb840016b88b
| * Add MIPS architecture supportPaul Lind2012-08-071-1/+5
| | | | | | | | | | | | Change-Id: Id2c3f41edee0e1c73cb084666533802bcf117876 Signed-off-by: Douglas Leung <douglas@mips.com> Signed-off-by: Chris Dearman <chris@mips.com>
* | net: networking optimizationsEbrahem Qassem2012-09-1163-120/+3792
|/ | | | | | | | | | | | | | | features: - early connection - memory cache - caching of redirection - request queue priority - closing unused sockets - SHUTR - fin aggregation - object prefetch - dns host name prioritization Change-Id: Ief90b8206ba48115eaeb12d554424d65f36427ac
* Merge "DO NOT MERGE Work around for use-after-free cert bug" into jb-devSelim Gurun2012-06-073-31/+36
|\
| * DO NOT MERGE Work around for use-after-free cert bugJonathan Dixon2012-06-073-31/+36
| | | | | | | | | | | | | | | | | | | | | | | | Cherry pick from master, SHA: 95b2bad159f2dbca0555e82f156db8424b75c2b8 Holds a strong references in the cert cache. This is a simpler alternative to full backport of upstream fix, from http://crrev.com/92977 -- see bug for more details. BUG: 6508448 Change-Id: Ic8182c267653216bbcafe466ecfe1951bf6a292a
* | DO NOT MERGE Convert exit calls to abort for AndroidSelim Gurun2012-06-061-0/+4
|/ | | | | | | | | | Bug: 6603427 Cherry picking from master to jb-dev. Sha: edec5f424996d4a532ba6fdb2203c06a02887606 This is to track some silent failures happening in mediaserver. Change-Id: I9345cee5e0137b723fd5a2b7c787c235af4462b8
* Disable TLSv1.2 and TLSv1.1.Selim Gurun2012-03-281-0/+6
| | | | | | | | | Bug: 6234791 Temporarily disabling TLSv1.1 and TLSv1.2 as some sites do not seem to like it (agl reports 2% of sites have issues). Change-Id: I182bc8296e2fa2681ca2c997b5524c0135b385bf
* Make SSL_CIPHER_get_id definition conditional on OpenSSL versionBrian Carlstrom2012-03-211-0/+5
| | | | Change-Id: I7a28fe9753e12fc3f597b0938de88130f50918ee
* Tracking openssl-1.0.1 upgradeBrian Carlstrom2012-03-161-3/+0
| | | | | | Bug: 6168278 Change-Id: I5df5750bf7fa15fe98d17e072943613966127a77
* Import content and address detector supportJohn Reck2012-02-231-1/+2
| | | | Change-Id: Iea123dd9b46b067105f945acd9e7ba8ba4421cf9
* Fix for bug 5152544, remove warning from chromium portKristian Monsen2011-11-221-1/+5
| | | | | | | This is a cherry-pick of http://codereview.chromium.org/8354008/ No more warnings after this is merged. Change-Id: I788d28545e7961d0145a3f1273ce4302f8c432ad
* am 361bc379: Merge "Enable persistent http connections." into ics-mr1Selim Gurun2011-11-171-6/+0
|\ | | | | | | | | * commit '361bc379144f4e67bca8b263c7a673fa73aafefc': Enable persistent http connections.
| * Merge "Enable persistent http connections." into ics-mr1Selim Gurun2011-11-171-6/+0
| |\
| | * Enable persistent http connections.Selim Gurun2011-11-171-6/+0
| | | | | | | | | | | | | | | | | | Bug:5347735 Change-Id: I03712a4a9a59b62440b6190fc84fe8ed78d072e7
* | | 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
| * | 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
| * | 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
| * | 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
| * | 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
* Fix for build breakKristian Monsen2011-10-241-2/+3
| | | | | | Export needed function for SPDY support Change-Id: I2a6c819d79dbc9dcf2e12eb41072cc0245954200
* Part of fix for bug 5455901 Export symbols from net/Kristian Monsen2011-10-2128-53/+87
| | | | | | | | | | | | 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 adding net_export.hKristian Monsen2011-10-211-0/+34
| | | | | | Adding net/base/net_export as it is in ToT chromium. Change-Id: Ia6e36b981854b26cf4ccdb315941dfb05aea0ff4
* 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
* 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
* transport socket pool: Fix missing init for valid UIDsJP Abgrall2011-08-121-1/+5
| | | | | | | | Missing class member init specific to ANDROID would cause socket tagging to be attempted most of the time. Change-Id: I0ac745efb764b24da9372721fc34596dd5b4ab34 Signed-off-by: JP Abgrall <jpa@google.com>
* Part of fix for bug 5152544 Reduce the number of warningKristian Monsen2011-08-111-0/+5
| | | | Change-Id: I960864ea02e41fda180544a5d077f63c3c3119b9
* external/chromium: Fix a comma typo.Ashish Sharma2011-08-091-2/+2
| | | | Change-Id: Ia6cf2a11537db2fe61670f2544e33e8ac5e8c118
* Network traffic accounting for client applications that use chromiumAshish Sharma2011-08-0930-15/+359
| | | | | | URLRequest stack. Change-Id: If7821debd1b10b19ebf5a3e7b9f6570efc73c4fc
* Remove the v8 dependecy from libchromium.Kristian Monsen2011-07-211-0/+6
| | | | | | Also fixed the makefile a bit. Change-Id: Ib63720dbd62d477657aa49a159f1b4f7956785d6
* Merge Chromium at r12.0.742.93: Compile fix in transport_security_state.ccKristian Monsen2011-07-081-2/+6
| | | | | | ifdef out command line switch Change-Id: I64509a51060b4b95202087080688cadebbf183ac
* Merge Chromium at r12.0.742.93: Compile fix in android proxyKristian Monsen2011-07-082-5/+7
| | | | | | | Functions changed upstream: http://src.chromium.org/viewvc/chrome/branches/742/src/net/proxy/proxy_config_service.h?view=diff&pathrev=88489&r1=81084&r2=81085 Change-Id: Id420fe2cab4d27f0bc75543bd00a8089f5e6551c