summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 843bcb6f: DefaultRequestDirector should ignore IOExceptions from stale ↵Brian Carlstrom2011-01-041-1/+12
|\ | | | | | | | | | | | | connections * commit '843bcb6f4f65c0cdca327c6467813b88c52042f3': DefaultRequestDirector should ignore IOExceptions from stale connections
| * DefaultRequestDirector should ignore IOExceptions from stale connectionsBrian Carlstrom2011-01-021-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | The DefaultRequestDirector was letting IOExceptions from closing stale connections affect new requests. However, it was very common to received "SSL shutdown failed" exceptions in this case, since an SSL "close notify" message could not be sent. Now these and other IOExceptions are ignored so the request can continue with a new socket. Bug: 3317717 Change-Id: I72f6f4a8f70aacb8b4c3e93c51e9808742d1a605
* | am 091f7ca4: Fix Apache HTTP client to recover from half-closed connections.Jesse Wilson2010-12-202-0/+34
|\ \ | |/ | | | | | | * commit '091f7ca4958c6f41c79808913c84ceea56d73b12': Fix Apache HTTP client to recover from half-closed connections.
| * Fix Apache HTTP client to recover from half-closed connections.Jesse Wilson2010-12-172-0/+34
| | | | | | | | | | | | | | | | | | android.net.http.DefaultHttpClientTest demonstrates a problem where half-closed connections get pooled, causing subsequent connections to timeout. Change-Id: I7275d99f12eafa28bb2336a3dd67546ffecb4dce http://b/2612240
* | am 3dafdc28: Merge "Use proxies specified by system properties in ↵Jesse Wilson2010-12-062-4/+18
|\ \ | |/ | | | | | | | | | | DefaultHttpClient." * commit '3dafdc28e38c2720a85d8581b068e09e709ac434': Use proxies specified by system properties in DefaultHttpClient.
| * Merge "Use proxies specified by system properties in DefaultHttpClient."Jesse Wilson2010-12-062-4/+18
| |\
| | * Use proxies specified by system properties in DefaultHttpClient.Jesse Wilson2010-12-062-4/+18
| | | | | | | | | | | | | | | Change-Id: Ic05f450a301d5478ff3a8f03af56ac0c0dbe3620 http://b/3254717
* | | am f0035c0e: Set per request socket timeout on reused connectionsBrian Carlstrom2010-12-041-1/+7
|\ \ \ | |/ / | | | | | | | | | * commit 'f0035c0e7077bc2d7a8aaf6516d96b0d2b1ba22d': Set per request socket timeout on reused connections
| * | Set per request socket timeout on reused connectionsBrian Carlstrom2010-12-031-1/+7
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even though SoTimeout, TcpNoDelay, and SoLinger can be specified per request in HttpParams, these values are only set on the underlying socket in the DefaultRequestDirector when ManagedClientConnection.open is called to create a new connection. On reused connection, no setting of Socket options was being done. There does not seem to be an easy way to fix this without changing one or more APIs but for the timeout case at least, we can use the fact that the ManagedClientConnection is an HttpConnection which has a setSocketTimeout method. Bug: 3241899 Change-Id: I080147b017b961502b3ba98d40841fea679491eb
* | am bdd33184: am d5b79c97: am 9f7b511f: Don\'t leak sensitive information ↵Jesse Wilson2010-10-161-3/+21
|\ \ | |/ | | | | | | | | | | | | | | when logging cookies. Merge commit 'bdd331840a37ca37136f6c030ad557750372d53f' into dalvik-dev * commit 'bdd331840a37ca37136f6c030ad557750372d53f': Don't leak sensitive information when logging cookies.
| * am d5b79c97: am 9f7b511f: Don\'t leak sensitive information when logging ↵Jesse Wilson2010-10-161-3/+21
| |\ | | | | | | | | | | | | | | | | | | | | | | | | cookies. Merge commit 'd5b79c970e9c5cb22603663d8fcb0c5e49dd4371' * commit 'd5b79c970e9c5cb22603663d8fcb0c5e49dd4371': Don't leak sensitive information when logging cookies.
| | * am 9f7b511f: Don\'t leak sensitive information when logging cookies.Jesse Wilson2010-10-141-3/+21
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '9f7b511f4ac753992e9b726c41f7aec71092c15c' into gingerbread-plus-aosp * commit '9f7b511f4ac753992e9b726c41f7aec71092c15c': Don't leak sensitive information when logging cookies.
| | | * Don't leak sensitive information when logging cookies.Jesse Wilson2010-10-141-3/+21
| | | | | | | | | | | | | | | | | | | | Change-Id: Id3a171f588fb545e14188e69e7bf6f2d4ef25b5c http://b/3095990
* | | | am 597d5137: am bd6d1127: am 8232105e: Properly deprecate ↵Jesse Wilson2010-09-100-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | HttpRequestHandlerRegistry#matchUriRequestPattern. Merge commit '597d5137ae740427f4af4921abd04f826600c7e7' into dalvik-dev * commit '597d5137ae740427f4af4921abd04f826600c7e7': Properly deprecate HttpRequestHandlerRegistry#matchUriRequestPattern.
| * | | am bd6d1127: am 8232105e: Properly deprecate ↵Jesse Wilson2010-09-100-0/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | HttpRequestHandlerRegistry#matchUriRequestPattern. Merge commit 'bd6d112761d852a26b345521e66479c55f4aec6f' * commit 'bd6d112761d852a26b345521e66479c55f4aec6f': Properly deprecate HttpRequestHandlerRegistry#matchUriRequestPattern.
| | * | am 8232105e: Properly deprecate ↵Jesse Wilson2010-09-101-1/+2
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | HttpRequestHandlerRegistry#matchUriRequestPattern. Merge commit '8232105ef86740b2fddce9e9477aa16a450ee8a8' into gingerbread-plus-aosp * commit '8232105ef86740b2fddce9e9477aa16a450ee8a8': Properly deprecate HttpRequestHandlerRegistry#matchUriRequestPattern.
| | | * Properly deprecate HttpRequestHandlerRegistry#matchUriRequestPattern.Jesse Wilson2010-09-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This needs a comment and an annotation. The original deprecation was submitted in HTTPCORE-148, in this patch: https://issues.apache.org/jira/secure/attachment/12376138/changes.txt Change-Id: I3b4c6e61f03a5f6ffc42ac1f02155f5c58b2e79c
* | | | am edd8b732: Merge "Properly deprecate ↵Jesse Wilson2010-09-101-1/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | HttpRequestHandlerRegistry#matchUriRequestPattern." Merge commit 'edd8b732ef48130375d9f987c79fdda452ed1d9e' into dalvik-dev * commit 'edd8b732ef48130375d9f987c79fdda452ed1d9e': Properly deprecate HttpRequestHandlerRegistry#matchUriRequestPattern.
| * | | Merge "Properly deprecate HttpRequestHandlerRegistry#matchUriRequestPattern."Jesse Wilson2010-09-101-1/+2
| |\ \ \
| | * | | Properly deprecate HttpRequestHandlerRegistry#matchUriRequestPattern.Jesse Wilson2010-09-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This needs a comment and an annotation. The original deprecation was submitted in HTTPCORE-148, in this patch: https://issues.apache.org/jira/secure/attachment/12376138/changes.txt Change-Id: I4c8723c7a632ec09ee03d91f38097d758959f163
* | | | | am c70bdbc1: manual merge - fix buildJean-Baptiste Queru2010-08-180-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'c70bdbc1eb32e81259dbb4a5c028efef354e9c54' into dalvik-dev * commit 'c70bdbc1eb32e81259dbb4a5c028efef354e9c54': Cherry picking changes from dalvik-dev
| * | | | 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
generated by cgit v1.1 at 2024-12-23 03:53:43 +0000