summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* add tls1_1, tls1_2 settings, remove sslv3 fallback code, disable RC4HEADmasterWolfgang Wiedmeyer2015-09-276-22/+25
| | | | Change-Id: I9ab98fbeb040a4a2a0e8ba3c5e260f61303ed199
* Revert "net: networking optimizations"Ricardo Cerqueira2012-11-1966-3818/+162
| | | | This reverts commit 5fbe95affc8eeed93c678b1d271f64dcc4dd919b.
* Merge branch 'jb-mr1-release' of ↵Steve Kondik2012-11-1812-7/+213
|\ | | | | | | 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
| | * Merge "Null pointer check missing in chromium"Jean-Baptiste Queru2012-09-051-1/+7
| | |\
| | | * 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
| * | am f4aee7bd: Merge "back port upstream patch"Jean-Baptiste Queru2012-08-151-2/+3
| |\ \ | | |/ | | | | | | | | | * commit 'f4aee7bd601621d648044a0f918247fd81b6190a': back port upstream patch
| | * Merge "back port upstream patch"Jean-Baptiste Queru2012-08-151-2/+3
| | |\
| | | * back port upstream patchFengwei Yin2012-08-151-2/+3
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is from Chromium project. It's used to handle potential issue in scoped_refptr. This is upstream patch porting and the original link is: http://codereview.chromium.org/9021020/ unittest change was not included. Change-Id: I14ce3df0653ff29713f38eceaf07e9b409cfaedc Author: Fengwei Yin <fengwei.yin@intel.com> Singed-off-by: Shuo Gao <shuo.gao@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ: 37500
| * | am 1c684ed1: Merge "Fix lazy-instance template to preserve object alignment ↵Jean-Baptiste Queru2012-08-101-1/+12
| |\ \ | | |/ | | | | | | | | | | | | | | | on MIPS." * commit '1c684ed1b5ac92ae473db5718627405367eb1766': Fix lazy-instance template to preserve object alignment on MIPS.
| | * Merge "Fix lazy-instance template to preserve object alignment on MIPS."Jean-Baptiste Queru2012-08-101-1/+12
| | |\
| | | * Fix lazy-instance template to preserve object alignment on MIPS.Paul Lind2012-08-071-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The alignment attribute of an object was discarded when allocating storage for the lazy-instance. Alignment is important for MIPS, where doubles (and objects containing them) must be aligned on 8-byte boundary. The alignment attributes are included via a macro that is only defined under GCC, so that this change does not affect other build enviromments. Change-Id: I99047cf610618de2e7e29e5de85835dc45d99231 Signed-off-by: Paul Lind <plind@mips.com>
| * | | am 2af13d06: Merge "Add MIPS architecture support"Jean-Baptiste Queru2012-08-105-1/+176
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '2af13d061b168f46912c78a76f20bc3956422ca5': Add MIPS architecture support
| | * | Merge "Add MIPS architecture support"Jean-Baptiste Queru2012-08-105-1/+176
| | |\ \ | | | |/ | | |/|
| | | * Add MIPS architecture supportPaul Lind2012-08-075-1/+176
| | |/ | | | | | | | | | | | | | | | Change-Id: Id2c3f41edee0e1c73cb084666533802bcf117876 Signed-off-by: Douglas Leung <douglas@mips.com> Signed-off-by: Chris Dearman <chris@mips.com>
| * | am 0abec4da: Merge "Forward-compatible fix for ucontext_t"David 'Digit' Turner2012-07-111-2/+2
| |\ \ | | |/ | | | | | | | | | * commit '0abec4daa38319f371ac6555e7887f6b14f34291': Forward-compatible fix for ucontext_t
| | * Merge "Forward-compatible fix for ucontext_t"David 'Digit' Turner2012-07-111-2/+2
| | |\
| | | * Forward-compatible fix for ucontext_tDavid 'Digit' Turner2012-07-111-2/+2
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | The Android C library <signal.h> will soon be modified to declare ucontext_t in <signal.h>. To avoid conflicts when this happens, only define the type when needed. See b/issue?id=2189142 Change-Id: I297b8e6f9fba8fb99c5f799b0d7e7f4dbda914bb
| * | am 2f413d82: Reconcile with jb-releaseThe Android Open Source Project2012-06-110-0/+0
| |\ \ | | |/ | | | | | | * commit '2f413d82e2541002b7f9507ad66d341d130f80e1':
| | * Reconcile with jb-releaseThe Android Open Source Project2012-06-110-0/+0
| | |\ | | | | | | | | | | | | Change-Id: Ib0777e5e7794dec80266a4c25946b267d316f527
| * | \ am ea30d010: (-s ours) am 0fcb69e6: Merge "DO NOT MERGE Work around for ↵Selim Gurun2012-06-070-0/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | use-after-free cert bug" into jb-dev * commit 'ea30d01040ba3e7119f24f8a15632c929b93e6d5': DO NOT MERGE Work around for use-after-free cert bug
| | * | am 0fcb69e6: Merge "DO NOT MERGE Work around for use-after-free cert bug" ↵Selim Gurun2012-06-073-31/+36
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev * commit '0fcb69e6703c52ab000dee698d4c07d19eeefee9': DO NOT MERGE Work around for use-after-free cert bug
| * | \ \ Merge "Work around for use-after-free cert bug"Selim Gurun2012-06-073-31/+36
| |\ \ \ \
| | * | | | Work around for use-after-free cert bugJonathan Dixon2012-06-073-31/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: Ib47ca2e33b9e43ac47baf645069ecaab257ec74a
| * | | | | am 99912695: Reconcile with jb-releaseThe Android Open Source Project2012-06-070-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | * commit '99912695a49365b7caa3586656e8fa68eb0bcd33':
| | * | | | Reconcile with jb-releaseThe Android Open Source Project2012-06-070-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: I39749f27bd2911551a009fed4a3ed045a5e6eb12
| * | \ \ \ \ am c2c49272: (-s ours) am 86e0fcf8: DO NOT MERGE Convert exit calls to abort ↵Selim Gurun2012-06-060-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for Android * commit 'c2c49272a8d186f5abd688836f1deaaf06865f9d': DO NOT MERGE Convert exit calls to abort for Android
| | * | | | | am 86e0fcf8: DO NOT MERGE Convert exit calls to abort for AndroidSelim Gurun2012-06-062-0/+40
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '86e0fcf830dcbada802ea2de22904e912dda5384': DO NOT MERGE Convert exit calls to abort for Android
| * | | | | | | Convert exit calls to abort for AndroidSelim Gurun2012-06-052-0/+40
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6603427 This is to track some silent failures happening in mediaserver. Change-Id: I9345cee5e0137b723fd5a2b7c787c235af4462b8
| * | | | | | Modify Makefile for building for ASANSelim Gurun2012-05-241-0/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | Change-Id: I18fe150f994d9217d0526660b1cac781fdac92cb
| | | | | |
| | \ \ \ \
| *-. \ \ \ \ Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-160-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | Change-Id: Ibe87f908fb7665825284926900227a6f6428e153
* | | | | | | net: networking optimizationsEbrahem Qassem2012-09-1166-162/+3818
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 in jb-release history after reset to jb-devThe Android Automerger2012-06-080-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | / | |_|_|_|/ |/| | | |
| * | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-070-0/+0
| |\ \ \ \ | | | |/ / | | |/| / | | |_|/ | |/| |
| | * | merge in jb-release history after reset to jb-devThe Android Automerger2012-04-300-0/+0
| | |\ \ | | | |/ | | |/|
| | | * 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
* | | | 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-062-0/+40
|/ / | | | | | | | | | | | | | | | | | | Bug: 6603427 Cherry picking from master to jb-dev. Sha: edec5f424996d4a532ba6fdb2203c06a02887606 This is to track some silent failures happening in mediaserver. Change-Id: I9345cee5e0137b723fd5a2b7c787c235af4462b8
* | Properly clean an exception to prevent a crashSelim Gurun2012-04-271-0/+5
| | | | | | | | | | Bug: 6404408 Change-Id: Id9a6e1ff303076da24f0221d3bc905ba0710f07e
* | Merge remote-tracking branch 'goog/ics-aah'Mike Lockwood2012-04-030-0/+0
|\ \
| * \ am 361bc379: Merge "Enable persistent http connections." into ics-mr1Selim Gurun2011-11-171-6/+0
| |\ \ | | | | | | | | | | | | | | | | * commit '361bc379144f4e67bca8b263c7a673fa73aafefc': Enable persistent http connections.
| * \ \ am 39ad9f56: Merge "Defer closing idle sockets." into ics-mr1Selim Gurun2011-11-173-4/+132
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '39ad9f5657323d3852f6741c79b830019baba4a8': Defer closing idle sockets.
| * \ \ \ am efe273f2: Part of fix for bug 5523834, backporting cache fixesKristian Monsen2011-11-1710-61/+187
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'efe273f2861c2ea723aa1f9edd20a73356da2b6b': Part of fix for bug 5523834, backporting cache fixes
| * \ \ \ \ am 1ab02c36: Part of fix for bug 5523834, backporting cache fixesKristian Monsen2011-11-174-12/+65
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1ab02c36bee95e85558f6815b2836e9ee6a26b19': Part of fix for bug 5523834, backporting cache fixes
| * \ \ \ \ \ am 93bed14e: Part of fix for bug 5523834, backporting cache fixesKristian Monsen2011-11-176-5/+39
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '93bed14e13dd5a6dd3d68bcf6d3c7c1f691f669b': Part of fix for bug 5523834, backporting cache fixes
| * \ \ \ \ \ \ am a972e26e: Part of fix for bug 5523834, backporting cache fixesKristian Monsen2011-11-174-22/+56
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a972e26e14066ec50afdaf4582836fe5fc4c190a': Part of fix for bug 5523834, backporting cache fixes
| * \ \ \ \ \ \ \ am 2c4085b2: Backport SPDY ping changes from chrome 16.Selim Gurun2011-11-1116-62/+1252
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2c4085b2006233b5e3a3fe507d62642377b5dc2e': Backport SPDY ping changes from chrome 16.
| * \ \ \ \ \ \ \ \ keep previous history after reset to mr1 plus aah changes (ics-aah-wip)Ed Heyl2011-10-280-0/+0
| |\ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2024-04-28 19:32:53 +0000