summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | undo reset to ics-mr1 until we have a better methodEd Heyl2011-10-260-0/+0
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ reset to ics-mr1, but keep historyEd Heyl2011-10-260-0/+0
| | | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| / / / / / / / / / | | |/ / / / / / / / /
| | * | | | | | | | | am 92b6b8e6: Merge "fix for bug 5454586, fix up getDbThread()"Kristian Monsen2011-10-251-41/+14
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '92b6b8e6dd0ba578b9091f7826568fccab6d2cf9': fix for bug 5454586, fix up getDbThread()
| | * \ \ \ \ \ \ \ \ \ am b54fbb0d: Fix for build breakKristian Monsen2011-10-241-2/+3
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b54fbb0d9cf6451f1683823838b6c0d2b345ed4b': Fix for build break
| | * | | | | | | | | | am 9fb7297d: Part of fix for bug 5455901 Fix makefile, turn off exporting ↵Kristian Monsen2011-10-241-3/+3
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | everything * commit '9fb7297dd54aca7ba646ee27608529f33634a7b2': Part of fix for bug 5455901 Fix makefile, turn off exporting everything
| | * \ \ \ \ \ \ \ \ \ \ am 41543423: Part of fix for bug 5455901 Export symbols from baseKristian Monsen2011-10-245-11/+36
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4154342345fc67972570f59528233826cd397f1e': Part of fix for bug 5455901 Export symbols from base
| | * \ \ \ \ \ \ \ \ \ \ \ am a1fe9c04: Part of fix for bug 5455901 Add exports needed for autofill and ↵Kristian Monsen2011-10-247-8/+61
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cookies * commit 'a1fe9c0450e6d56112949b33ef2f7491e0cf0f60': Part of fix for bug 5455901 Add exports needed for autofill and cookies
| | * \ \ \ \ \ \ \ \ \ \ \ \ am 25577496: Part of fix for bug 5455901 Export symbols from net/Kristian Monsen2011-10-2429-55/+94
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2557749644f9d25af9721533322db19197c49b49': Part of fix for bug 5455901 Export symbols from net/
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ am a3fef89e: Part of fix for bug 5455901 Export symbols in android/Kristian Monsen2011-10-243-3/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a3fef89eb00853adb6524ab3d11c60f754f08b09': Part of fix for bug 5455901 Export symbols in android/
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am cd7ce18e: Part of fix for bug 5455901 adding net_export.hKristian Monsen2011-10-241-0/+34
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cd7ce18ede8128e5c7a10cbc96c9ab197a4999b0': Part of fix for bug 5455901 adding net_export.h
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am eaa86de4: Remove temporary debug loggingSteve Block2011-10-193-74/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eaa86de4aa5278c05c8f4798a564a26ad2b1b0bc': Remove temporary debug logging
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 8d1e40fa: am c0c5e0fc: Fix SQLitePersistentCookieStore\'s getDbThread() ↵Steve Block2011-10-141-12/+26
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to be threadsafe * commit '8d1e40fa83064d70b192f1b5aed95b8fc24e4cac': Fix SQLitePersistentCookieStore's getDbThread() to be threadsafe
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7d980efe: am df5ec85c: Merge "Causing webviews to hang." into ics-mr0Chris Craik2011-10-131-21/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7d980efe6a2f9473c310a16bed689819ff3dee62': Causing webviews to hang.
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e3b44106: (-s ours) am 08712c35: (-s ours) Remove temporary debug logging ↵Steve Block2011-10-130-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - DO NOT MERGE * commit 'e3b44106f63aebd3a6e753bdebe4962455d5fcb9': Remove temporary debug logging - DO NOT MERGE
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 47f5154a: Fix SQLitePersistentCookieStore\'s getDbThread() to be threadsafeSteve Block2011-10-131-12/+21
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '47f5154a4217fb3626326224fc1c7d3c9918dd09': Fix SQLitePersistentCookieStore's getDbThread() to be threadsafe
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d0a07ba4: More logging in Thread to help debuggingSteve Block2011-10-102-15/+43
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd0a07ba49f88f1e331ac5fd80f30c81d975ebd12': More logging in Thread to help debugging
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 28480d4f: Add more logging to Thread and WaitableEvent to help debuggingSteve Block2011-10-072-0/+36
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '28480d4f48373da735986b2a75e099d3cfddab3e': Add more logging to Thread and WaitableEvent to help debugging
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 9306e92a: Use notable values when clearing Thread::startup_data_ to help ↵Steve Block2011-10-031-0/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with debugging * commit '9306e92a0b28f7c70a3e29272141b0e271452479': Use notable values when clearing Thread::startup_data_ to help with debugging
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e4aeb840: Reapply: Fix for bug 5226268 [Browser] http keep-aliveKristian Monsen2011-09-202-0/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e4aeb840e5cd2acd20cf6b18af808af55a92e745': Reapply: Fix for bug 5226268 [Browser] http keep-alive
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d2fbc57a: Reconcile with ics-factoryrom-releaseThe Android Open Source Project2011-09-190-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd2fbc57a904aa88c9b79b1c34d6e2f5520a2ad78': Fix for bug 5226268 [Browser] http keep-alive DO NOT MERGE
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2e6e5ef7: (-s ours) am c391e782: (-s ours) Fix for bug 5226268 [Browser] ↵Kristian Monsen2011-09-180-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http keep-alive DO NOT MERGE * commit '2e6e5ef77762f9f5bca72bf42842a5aa1baa2953': Fix for bug 5226268 [Browser] http keep-alive DO NOT MERGE
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-237-3/+208
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iea123dd9b46b067105f945acd9e7ba8ba4421cf9
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Append client parameter to AutoFill server requests.Ben Murdoch2012-02-161-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4515820 Change-Id: I32fe0918c0d9f80f1930a481e47c3e7ce285c329
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for bug 5152544, remove warning from chromium portKristian Monsen2011-11-222-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | | | | | | | | 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
generated by cgit v1.1 at 2024-12-22 10:10:52 +0000