summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Stricter subject DN parsing for HTTPS hostname verification.HEADreplicant-4.2-0004replicant-4.2-0003replicant-4.2Alex Klyubin2014-11-161-32/+4
| | | | | | | | | | | This switches AbstractVerifier to the DN parser used by the platform default HostnameVerifier. Bug: 16510257 (cherry picked from commit ec8c48dd748c81ba2cce518bf83cb9f236c30bae) Change-Id: I8124b54801481065df5230c1277e59c5e602b2b9
* am e6fe5ecb: Merge "Remove obsolete ThirdPartyProject.prop files."Elliott Hughes2012-09-202-20/+0
|\ | | | | | | | | * commit 'e6fe5ecbfb2977220a6f51ba4da7bd5f83d8d670': Remove obsolete ThirdPartyProject.prop files.
| * Merge "Remove obsolete ThirdPartyProject.prop files."Elliott Hughes2012-09-203-29/+0
| |\
| | * Remove obsolete ThirdPartyProject.prop files.Elliott Hughes2012-09-203-29/+0
| |/ | | | | | | Change-Id: I596a7c461eacd56457b3d10120f51afc7bafa905
* | Remove obsolete ThirdPartyProject.prop file.Elliott Hughes2012-05-151-9/+0
|/ | | | Change-Id: I957bfb78642a965ee375441f087919e1e24cedac
* Advertise HttpURLConnection in DefaultHttpClient.Jesse Wilson2011-12-151-32/+42
| | | | Change-Id: I97a1a139fbe95cf63b1f921daea9e4c55c118a7f
* Remove incorrect doc comments. The scheme registry may not be null.Jesse Wilson2011-11-102-4/+2
| | | | | Bug: http://code.google.com/p/android/issues/detail?id=17073 Change-Id: I957549860d0b61acc08924156d5c43b7d182c27d
* Fix NPE in DefaultRequestDirectorJesse Wilson2011-09-271-1/+1
| | | | | | | | | When the HTTP client encountered a server failure while talking through a proxy, it fails with an NullPointerException and not an IOException. Bug: http://b/5372438 Change-Id: I67848d52f5d01c9e353fcc7d66d48ec821d9b4ba
* Try the next address after any type of connection failure.Jesse Wilson2011-09-121-3/+9
| | | | | | | | | Previously we'd fail IPv4 if IPv6 failed with a EHOSTUNREACH error (which may be thrown as a SocketException or as a NoRouteToHostException, depending on the platform). Bug: http://b/5293809 Change-Id: Idca2e9bd561a23cff88b1399d45db65b96980148
* Add optional host build of apache-httpBrian Carlstrom2011-07-161-0/+29
| | | | Change-Id: I905c60b91b4118180294c8c95ce30514e50e7d3c
* Track move of socket tagging from libcore to frameworks/base.Jesse Wilson2011-06-282-8/+6
| | | | Change-Id: I989f7ecab7e4fd1cf21bbe0782e960dfe3b4c8e8
* Ignore case on digest algorithms.Jesse Wilson2011-06-241-2/+2
| | | | | Change-Id: If80c5f6ecca609abdb3b274e00b8ea8a75248f23 http://code.google.com/p/android/issues/detail?id=16051
* am d8a18733: am 00efe680: Merge "Make Apache HttpClient play nice with large ↵Elliott Hughes2011-05-160-0/+0
|\ | | | | | | | | | | | | kernel socket buffers." * commit 'd8a18733ccf412e54cb887526883b285027ebc5a': Make Apache HttpClient play nice with large kernel socket buffers.
| * am 00efe680: Merge "Make Apache HttpClient play nice with large kernel ↵Elliott Hughes2011-05-160-0/+0
| |\ | | | | | | | | | | | | | | | | | | socket buffers." * commit '00efe680b4cc6e9849cb270058ac5967af92ffef': Make Apache HttpClient play nice with large kernel socket buffers.
| | * Merge "Make Apache HttpClient play nice with large kernel socket buffers."Elliott Hughes2011-05-162-58/+24
| | |\
| | | * Make Apache HttpClient play nice with large kernel socket buffers.Elliott Hughes2011-05-132-58/+24
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Given the large maximum size likely to be set for kernel socket buffers on LTE devices, we need to stop Apache HttpClient from allocating some integer multiple of that size on the heap for each socket. On one device, 16 HTTP connections would fill the heap. Bug: 3514259 Change-Id: I4a8c13882ad794ddbeaf53a6cdc4d42d1aa3fb2f
* | | Merge "Add Socket tagging for granular data accounting."Jeff Sharkey2011-05-132-0/+50
|\ \ \
| * | | Add Socket tagging for granular data accounting.Jeff Sharkey2011-05-132-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes SingleClientConnManager and ThreadSafeClientConnManager to tag any recycled Sockets based on the current thread. (Actual tagging is maintained and applied in BlockGuard.) Change-Id: Ib34897bb2af8641fa65adc664f7858f9d43ffeeb
* | | | am e30b5b55: Make Apache HttpClient play nice with large kernel socket buffers.Elliott Hughes2011-05-102-58/+24
|\ \ \ \ | |/ / / |/| / / | |/ / | | | * commit 'e30b5b55806b31d1a61e2885b854dd7b8da1a07a': Make Apache HttpClient play nice with large kernel socket buffers.
| * | Make Apache HttpClient play nice with large kernel socket buffers.Elliott Hughes2011-05-032-58/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Given the large maximum size likely to be set for kernel socket buffers on LTE devices, we need to stop Apache HttpClient from allocating some integer multiple of that size on the heap for each socket. On one device, 16 HTTP connections would fill the heap. Bug: 3514259 Change-Id: I888c03b6ad4b7ca444c2c423b097a3f76390846b
* | | Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-masterBrian Carlstrom2011-04-011-1/+1
|\ \ \ | |/ / |/| |
| * | Backport hostname verification correctness fixBrian Carlstrom2011-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From libcore's commit with sha 6767bdbe6bb1d4542c97868d8df1f71d2414fc62 The only behavior change should be a bug fix. There was a check "cn.lastIndexOf('.') >= 0" that was always true. This has been fixed to match the comment "require two dots". Change-Id: I680cad56a1f86150128e587f8c8e19be6ef27bc3
| * | am 403f11d9: am ae89fd35: am e59c288f: am b91c5e93: DefaultRequestDirector ↵Brian Carlstrom2011-01-300-0/+0
| |\ \ | |/ / |/| | | | | | | | | | | | | | should ignore IOExceptions from stale connections * commit '403f11d92b25f7c3060b1a973d4076c5d6585ccf': DefaultRequestDirector should ignore IOExceptions from stale connections
* | | am ae89fd35: am e59c288f: am b91c5e93: DefaultRequestDirector should ignore ↵Brian Carlstrom2011-01-300-0/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | IOExceptions from stale connections * commit 'ae89fd35ba04735b80c5f79b9a31fa3c31519ee0': DefaultRequestDirector should ignore IOExceptions from stale connections
| * \ \ am e59c288f: am b91c5e93: DefaultRequestDirector should ignore IOExceptions ↵Brian Carlstrom2011-01-300-0/+0
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | from stale connections * commit 'e59c288fca5a99d07f09494e8d03a228a347c3f8': DefaultRequestDirector should ignore IOExceptions from stale connections
| | * | am b91c5e93: DefaultRequestDirector should ignore IOExceptions from stale ↵Brian Carlstrom2011-01-301-1/+12
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | connections * commit 'b91c5e936342afbdd58c88ac604d5dd505d0fe0c': DefaultRequestDirector should ignore IOExceptions from stale connections
| | | * | DefaultRequestDirector should ignore IOExceptions from stale connectionsBrian Carlstrom2011-01-301-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: 3405962 Bug: 3317717 git cherry-pick -e 843bcb6f4f65c0cdca327c6467813b88c52042f3 Change-Id: I443b4915f6473e07d74a37377dade6ac1f9f600c
| | | | * am 2d8fd9be: Help the caller along if a malformed URI is used to make an ↵Jesse Wilson2011-01-061-2/+16
| | | | |\ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | HTTP request. * commit '2d8fd9bea30efcae4cc418e223f2c61febe0caa0': Help the caller along if a malformed URI is used to make an HTTP request.
* | | | | Help the caller along if a malformed URI is used to make an HTTP request.Jesse Wilson2011-01-061-2/+16
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We had problems where we gave a cryptic error when the user's request URL like "www.example.org/api/json/get_stuff" is interpretted as a relative path rather than a fully qualified address: java.lang.IllegalStateException: Target host must not be null, or set in parameters. The new message breaks the address into parts to make this more clear: java.lang.IllegalStateException: Target host must not be null, or set in parameters. scheme=null, host=null, path=www.example.org/api/json/get_stuff Change-Id: Ie102718dc15b92d68835f1c34b538639f500eeaa http://code.google.com/p/android/issues/detail?id=9929
| | | * 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
generated by cgit v1.1 at 2024-12-22 07:19:52 +0000