summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | manual merge - fix buildJean-Baptiste Queru2010-08-183-4/+11
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / Change-Id: I5417fd6ad71fd3cd0520f1fe89921fa01f8a0869
| * | | am 166ed46d: Cherry picking changes from dalvik-devBrian Carlstrom2010-08-184-41/+11
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '166ed46d7e5312857b8a9b8d07c00373c596c1b3' into gingerbread-plus-aosp * commit '166ed46d7e5312857b8a9b8d07c00373c596c1b3': Cherry picking changes from dalvik-dev
| | * | Cherry picking changes from dalvik-devBrian Carlstrom2010-08-185-42/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git cherry-pick --no-commit 5648c97be2c515bdafeff3d8a4b07ea0ddc3e357 git cherry-pick --no-commit ffdb1757 git cherry-pick --no-commit 9340bb2a4b5f828b418c0e77492dde148623c938 git cherry-pick --no-commit af5c56d1 Change-Id: Ie910601ca27e1fcff90bbf0db5bd522bab8924f7
| | | * am 3b74bc0a: am 301b1df2: am 9340bb2a: Fixed problem using HTTPS with Apache ↵Andreas Sandblad2010-07-301-1/+1
| | | |\ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | HTTP Client when using proxy Merge commit '3b74bc0ac45043a6b559d44aa913de5803793a56' into dalvik-dev * commit '3b74bc0ac45043a6b559d44aa913de5803793a56': Fixed problem using HTTPS with Apache HTTP Client when using proxy
* | | | am 301b1df2: am 9340bb2a: Fixed problem using HTTPS with Apache HTTP Client ↵Andreas Sandblad2010-07-301-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | when using proxy Merge commit '301b1df2f0b25ef56a640840742c981623faf20f' * commit '301b1df2f0b25ef56a640840742c981623faf20f': Fixed problem using HTTPS with Apache HTTP Client when using proxy
| * | | am 9340bb2a: Fixed problem using HTTPS with Apache HTTP Client when using proxyAndreas Sandblad2010-07-301-1/+1
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Merge commit '9340bb2a4b5f828b418c0e77492dde148623c938' into gingerbread-plus-aosp * commit '9340bb2a4b5f828b418c0e77492dde148623c938': Fixed problem using HTTPS with Apache HTTP Client when using proxy
| | * | Fixed problem using HTTPS with Apache HTTP Client when using proxyAndreas Sandblad2010-07-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem described at: http://code.google.com/p/android/issues/detail?id=2690 The fix is to set default port for scheme to avoid passing -1 as port, which would cause an IllegalArgumentException. Change-Id: Ib1324618cdb6e3aa629dea2a2de1856136223aaf
| | | * am 18a021c6: am 3cb0a125: add meta-files about 3rd party projectsThe Android Open Source Project2010-07-190-0/+0
| | | |\ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Merge commit '18a021c6d6e877e28ac55ffe2d06b7563605c7a0' into dalvik-dev * commit '18a021c6d6e877e28ac55ffe2d06b7563605c7a0': add meta-files about 3rd party projects
* | | | am 3cb0a125: add meta-files about 3rd party projectsThe Android Open Source Project2010-07-163-0/+29
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '3cb0a1255c395895fe34ce01c279b88103200ccb' * commit '3cb0a1255c395895fe34ce01c279b88103200ccb': add meta-files about 3rd party projects
| * | | add meta-files about 3rd party projectsThe Android Open Source Project2010-07-163-0/+29
| |/ / | | | | | | | | | Change-Id: Idadf71f9935d34f95e7df68a3ffb59e0d8f154b8
| | * am 5648c97b: Remove explicit SSLSocket.startHandshakeBrian Carlstrom2010-07-191-37/+0
| | |\ | |_|/ |/| | | | | | | | | | | | | | Merge commit '5648c97be2c515bdafeff3d8a4b07ea0ddc3e357' into dalvik-dev * commit '5648c97be2c515bdafeff3d8a4b07ea0ddc3e357': Remove explicit SSLSocket.startHandshake
* | | Remove explicit SSLSocket.startHandshakeBrian Carlstrom2010-05-051-37/+0
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | When dalvik-dev merges to master, startHandshake will imply that the caller wants a fully synchronous handshake instead of using handshake cutthrough. This removes an unnecessary startHandshake so that handshake cutthrough won't be disabled for Apache http connections. This change brings Abstract verify into sync with the code from javax.net.ssl.DefaultHostnameVerifier from dalvik-dev which also removed this same duplicated code. src/org/apache/http/conn/ssl/AbstractVerifier.java Change-Id: I505e27db97ce49d3c76b3a8af9046238149500d3
| * add meta-files about 3rd party projectsThe Android Open Source Project2010-07-193-0/+29
| | | | | | | | Change-Id: Idadf71f9935d34f95e7df68a3ffb59e0d8f154b8
| * Turning off expect-continue by default in Apache HTTP client.Jesse Wilson2010-05-061-1/+8
| | | | | | | | | | Change-Id: I24d9950e23596770c4b2835f3f3c23ced9cb7651 http://b/2471595
| * RFC2616 says it's "100-continue", not "100-Continue".Elliott Hughes2010-04-282-3/+3
|/ | | | | Bug: http://code.google.com/p/android/issues/detail?id=7208 Change-Id: I66dd64fb068fc920ed47e0b3efdac5e70e603027
* b/2599994 Should call prepareSocket on underlying socket, not layered socketBrian Carlstrom2010-04-181-2/+12
| | | | | | | | | | | | | | | | | | | DefaultClientConnectionOperator.openConnection was recently changed to use LayeredSocketFactory.createSocket(Socket, ...) to create an SSLSocket around a plain java.net.Socket. However, this means code in LayeredSocketFactory.createSocket(Socket, ...) is called before socket options such as timeout are set by DefaultClientConnectionOperator.prepareSocket. However, the default org.apache.http.conn.ssl.SSLSocketFactory.createSocket(Socket, ...) performes the SSL handshake to perform hostname verification, meaning the handshake is performed without timeouts set. This change to DefaultClientConnectionOperator.openConnection moves the call prepareSocket to be on the underlying java.net.Socket before it is has the SSLSocket layered on top of it to prevent hangs during SSL handshakes. Change-Id: If705cc1acfe524281ec1338f73eccf7c0f4d1227
* Merge "Implement proper multihoming support, second attempt."Dan Egnor2010-03-092-12/+54
|\
| * Implement proper multihoming support, second attempt.Steinar H. Gunderson2010-03-052-12/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch makes our HTTP client multihoming-aware, so if one server fails for whatever reason (including timeout), we'll fall back to the next. It's a bit more complex than the first attempt, but we're hopefully not breaking SSL connection (incl. checkin) anymore. Also includes one patch from upstream, in that timeouts are converted from Java's exception hierarchy to our own exceptions. Here's an example tcpdump from a fake checkin server with both AAAA and A records, where the IPv6 connectivity is deliberately broken to demonstrate the effects of this patch: 11:49:28.202620 IP6 2620:0:105f:a:223:76ff:fe8d:3a3c.37109 > 2001:700:300:1880::2.80: S 24035192:24035192(0) win 5760 <mss 1440,sackOK,timestamp 1110775 0,[|tcp]> 11:49:31.211370 IP6 2620:0:105f:a:223:76ff:fe8d:3a3c.37109 > 2001:700:300:1880::2.80: S 24035192:24035192(0) win 5760 <mss 1440,sackOK,timestamp 1111075 0,[|tcp]> 11:49:37.211186 IP6 2620:0:105f:a:223:76ff:fe8d:3a3c.37109 > 2001:700:300:1880::2.80: S 24035192:24035192(0) win 5760 <mss 1440,sackOK,timestamp 1111675 0,[|tcp]> 11:49:48.216299 IP 74.125.57.33.58205 > 129.241.93.35.80: S 2632654863:2632654863(0) win 5840 <mss 1372,sackOK,timestamp 1112775 0,nop,wscale 1> 11:49:48.216324 IP 129.241.93.35.80 > 74.125.57.33.58205: S 3149921981:3149921981(0) ack 2632654864 win 5792 <mss 1460,sackOK,timestamp 62633484 1112775,nop,wscale 8> (...) and then the HTTP connection proceeds as usual. I intend to push this fix upstream once we get it reviewed and committed locally.
* | Add an empty CleanSpec.mkJean-Baptiste Queru2010-03-081-0/+49
| | | | | | | | Change-Id: Ib47597b8cc98c33caf8588bc270ac811194e6f74
* | Fix lineFromReadBuffer() so it no longer tries to skip backwardsDan Bornstein2010-03-051-1/+5
|/ | | | | | | | past the start of the read buffer. Fixes internal bug #2183785. Change-Id: I2a371e88a6816f4c1e237ae4cdb8baade4de66c9
* Revert "Implement proper multihoming support, so if one server fails for ↵Kenny Root2010-02-262-34/+16
| | | | | | whatever reason" This reverts commit ceab342827538782a715a10e5030a222700895ce.
* Implement proper multihoming support, so if one server fails for whatever reasonSteinar H. Gunderson2010-02-262-16/+34
| | | | | | | | | | | | | | | | | | | | | | (including timeout), we'll fall back to the next. Also includes one patch from upstream, in that timeouts are converted from Java's exception hierarchy to our own exceptions. Here's an example tcpdump from a fake checkin server with both AAAA and A records, where the IPv6 connectivity is deliberately broken to demonstrate the effects of this patch: 11:49:28.202620 IP6 2620:0:105f:a:223:76ff:fe8d:3a3c.37109 > 2001:700:300:1880::2.80: S 24035192:24035192(0) win 5760 <mss 1440,sackOK,timestamp 1110775 0,[|tcp]> 11:49:31.211370 IP6 2620:0:105f:a:223:76ff:fe8d:3a3c.37109 > 2001:700:300:1880::2.80: S 24035192:24035192(0) win 5760 <mss 1440,sackOK,timestamp 1111075 0,[|tcp]> 11:49:37.211186 IP6 2620:0:105f:a:223:76ff:fe8d:3a3c.37109 > 2001:700:300:1880::2.80: S 24035192:24035192(0) win 5760 <mss 1440,sackOK,timestamp 1111675 0,[|tcp]> 11:49:48.216299 IP 74.125.57.33.58205 > 129.241.93.35.80: S 2632654863:2632654863(0) win 5840 <mss 1372,sackOK,timestamp 1112775 0,nop,wscale 1> 11:49:48.216324 IP 129.241.93.35.80 > 74.125.57.33.58205: S 3149921981:3149921981(0) ack 2632654864 win 5792 <mss 1460,sackOK,timestamp 62633484 1112775,nop,wscale 8> (...) and then the HTTP connection proceeds as usual. I intend to push this fix upstream once we get it reviewed and committed locally.
* am c5718a3d: reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
|\ | | | | | | | | | | | | Merge commit 'c5718a3d3d1786d57998315641361809d8f03e79' into eclair-plus-aosp * commit 'c5718a3d3d1786d57998315641361809d8f03e79': android-2.1_r1 snapshot
| * reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
| |\
| | * reconcile android-2.1_r1 snapshotThe Android Open Source Project2010-01-290-0/+0
| | |\ | |/ /
| | * android-2.1_r1 snapshotThe Android Open Source Project2010-01-120-0/+0
| | |
* | | merge from open-source masterJean-Baptiste Queru2009-09-040-0/+0
|\ \ \ | |/ / |/| |
| * | merge from donutJean-Baptiste Queru2009-09-032-0/+193
| |\ \ | | |/
* | | am 58fb7313: Add license-related filesJean-Baptiste Queru2009-08-182-0/+193
|\ \ \ | |/ / |/| / | |/ | | | | | | Merge commit '58fb7313fe53a7ce5fb153e79560719e06058a4b' into eclair * commit '58fb7313fe53a7ce5fb153e79560719e06058a4b': Add license-related files
| * Add license-related filesJean-Baptiste Queru2009-08-172-0/+193
| | | | | | | | BUG=1573996
* | Merge donut into masterJean-Baptiste Queru2009-04-220-0/+0
|\ \ | |/
* | Merge branch 'open_source_no_contributions' into google_internalThe Android Open Source Project2009-03-290-0/+0
|\ \ | |/ |/|
| * Merge commit 'remotes/korg/cupcake' into cupcake_to_masterJean-Baptiste Queru2009-03-181-0/+13
| |\ | |/ |/|
* | auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-03431-0/+60872
| |
* | auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-03431-60859/+0
| |
* | auto import from //depot/cupcake/@132589The Android Open Source Project2009-03-031-13/+0
| |
* | auto import from //depot/cupcake/@137055The Android Open Source Project2009-03-021-0/+13
|/
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-170-0/+0
|
* Initial ContributionThe Android Open Source Project2008-10-21431-0/+60859
generated by cgit v1.1 at 2024-04-27 20:41:46 +0000