summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am df55e5b2: am f7a2b81e: am 6e294b4e: am aeb8a635: am 945aab57: am ↵staging/cm-12.0-cafstaging/cm-12.0Alex Klyubin2014-07-280-0/+0
|\ | | | | | | | | | | | | a8283f02: am b260a116: Stricter subject DN parsing for HTTPS hostname verification. * commit 'df55e5b26b6b7cc90f9487cb0489cee1ed430d39': Stricter subject DN parsing for HTTPS hostname verification.
| * am f7a2b81e: am 6e294b4e: am aeb8a635: am 945aab57: am a8283f02: am ↵Alex Klyubin2014-07-281-32/+4
| |\ | | | | | | | | | | | | | | | | | | b260a116: Stricter subject DN parsing for HTTPS hostname verification. * commit 'f7a2b81e12cac8d9c11ddace681816942b6c6921': Stricter subject DN parsing for HTTPS hostname verification.
| | * am 6e294b4e: am aeb8a635: am 945aab57: am a8283f02: am b260a116: Stricter ↵Alex Klyubin2014-07-281-32/+4
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | subject DN parsing for HTTPS hostname verification. * commit '6e294b4ef28f740b25c802c8875dd72ce534e45c': Stricter subject DN parsing for HTTPS hostname verification.
| | | * am aeb8a635: am 945aab57: am a8283f02: am b260a116: Stricter subject DN ↵Alex Klyubin2014-07-281-32/+4
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parsing for HTTPS hostname verification. * commit 'aeb8a635a5ede56e25131c7daf8e30ff38feda5d': Stricter subject DN parsing for HTTPS hostname verification.
| | | | * am 945aab57: am a8283f02: am b260a116: Stricter subject DN parsing for HTTPS ↵Alex Klyubin2014-07-281-32/+4
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hostname verification. * commit '945aab573e30fef6e521d98a2a8af4c89baffacf': Stricter subject DN parsing for HTTPS hostname verification.
| | | | | * am a8283f02: am b260a116: Stricter subject DN parsing for HTTPS hostname ↵Alex Klyubin2014-07-281-32/+4
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | verification. * commit 'a8283f028ecee6bf241fa6c9a8f945a1d9f6f83e': Stricter subject DN parsing for HTTPS hostname verification.
| | | | | | * am b260a116: Stricter subject DN parsing for HTTPS hostname verification.Alex Klyubin2014-07-281-32/+4
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b260a116b1480df2bad2560986c60a707ea01c4f': Stricter subject DN parsing for HTTPS hostname verification.
| | | | | | | * Stricter subject DN parsing for HTTPS hostname verification.Alex Klyubin2014-07-251-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
* | | | | | | | Stricter subject DN parsing for HTTPS hostname verification.Alex Klyubin2014-07-241-32/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This switches AbstractVerifier to the DN parser used by the platform default HostnameVerifier. Bug: 16510257 Change-Id: Iedd27cec162167dad11a4fe477d4eaa3eba004b7
* | | | | | | | am 85ed0e10: Merge "Remove deprecated WITH_HOST_DALVIK."Ian Rogers2014-06-131-8/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '85ed0e10781c3c57343300a02556dd5131c450aa': Remove deprecated WITH_HOST_DALVIK.
| * | | | | | | Merge "Remove deprecated WITH_HOST_DALVIK."Ian Rogers2014-06-121-8/+6
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Remove deprecated WITH_HOST_DALVIK.Ian Rogers2014-06-111-8/+6
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13751317 Change-Id: I52f9f7d745f92ec3c5f0d3cb2eda6d2d12a73d27
* | | | | | | am db971290: Merge "Remove use of LOCAL_BUILD_HOST_DEX"Narayan Kamath2013-11-250-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'db97129042e7baaab6eda49138d9328f1217aaca': Remove use of LOCAL_BUILD_HOST_DEX
| * | | | | | Merge "Remove use of LOCAL_BUILD_HOST_DEX"Narayan Kamath2013-11-251-2/+1
| |\ \ \ \ \ \
| | * | | | | | Remove use of LOCAL_BUILD_HOST_DEXNarayan Kamath2013-11-251-2/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 5b16ab4c0186b6478df4a7f0c8f5c23a9e6c5f99) Change-Id: I7b44009bc878a5b9e65380dae7ad1893608a67ac
* | | | | | | Remove use of LOCAL_BUILD_HOST_DEXNarayan Kamath2013-11-071-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I650527fb0b95a71f8d33bb2bfbb165cbf89c783b
* | | | | | | am a396af51: am 4bdf0c11: Merge "Do not initialize SSLSocketFactory too early"Kenny Root2013-09-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a396af51a908946a58d2b324cfe4a832cfff01cf': Do not initialize SSLSocketFactory too early
| * | | | | | am 4bdf0c11: Merge "Do not initialize SSLSocketFactory too early"Kenny Root2013-09-100-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * commit '4bdf0c11f7c6ec7e6310a579b40e7efd03baa94d': Do not initialize SSLSocketFactory too early
| | * | | | | Merge "Do not initialize SSLSocketFactory too early"Kenny Root2013-09-101-6/+13
| | |\ \ \ \ \
| | | * | | | | Do not initialize SSLSocketFactory too earlyKenny Root2013-09-101-6/+13
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During Zygote initialization, the class may be preloaded. However we do not want the default instances of SSLSocketFactory initialized, so move those into a holder class so they are only initialized when used. (cherry picked from commit 72017834153711733905dfcf4bfe7b802062692b) Bug: 9984058 Change-Id: Iaf44987c9f33d160617025ca2acba5691be58143
* | | | | | | am 95c6f1ba: (-s ours) am f6f431c2: (-s ours) Reconcile with jb-mr2-release ↵The Android Open Source Project2013-08-140-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - do not merge * commit '95c6f1ba7fb55d585e5d3373d1e5acfd30a8a5ed': Do not initialize SSLSocketFactory too early DO NOT MERGE
| * | | | | | am f6f431c2: (-s ours) Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-08-140-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | * commit 'f6f431c2d81fffccb5171e5e5b227e841c1ceb7e': Do not initialize SSLSocketFactory too early DO NOT MERGE
| | * | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-08-140-0/+0
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | Change-Id: I01671fe532f8a0807e4bfd86c51f169e93b3d54a
| | | * | | | Do not initialize SSLSocketFactory too early DO NOT MERGEKenny Root2013-08-131-6/+13
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During Zygote initialization, the class may be preloaded. However we do not want the default instances of SSLSocketFactory initialized, so move those into a holder class so they are only initialized when used. (cherry picked from commit 72017834153711733905dfcf4bfe7b802062692b) Bug: 9984058 Change-Id: I245d3d075c8c3476e9f76579ef7141e447f92011
* | | | | | am 0f90c3b4: am f469a0bb: am 7e523f42: am 9313bee9: am 40ff03b8: am ↵Kenny Root2013-08-140-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8868084e: Do not initialize SSLSocketFactory too early * commit '0f90c3b4d2e6c48a35443dd8bc01c8e6bb681804': Do not initialize SSLSocketFactory too early
| * | | | | am f469a0bb: am 7e523f42: am 9313bee9: am 40ff03b8: am 8868084e: Do not ↵Kenny Root2013-08-130-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initialize SSLSocketFactory too early * commit 'f469a0bb0221eea434f4ece795fe9dba390fd3a2': Do not initialize SSLSocketFactory too early
| | * | | | am 7e523f42: am 9313bee9: am 40ff03b8: am 8868084e: Do not initialize ↵Kenny Root2013-08-130-0/+0
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | SSLSocketFactory too early * commit '7e523f42e2545ba9664f56ce31afdf5ceeecaaeb': Do not initialize SSLSocketFactory too early
| | | * | | am 9313bee9: am 40ff03b8: am 8868084e: Do not initialize SSLSocketFactory ↵Kenny Root2013-08-131-6/+13
| | | |\ \ \ | | | | |/ / | | | |/| / | | | | |/ | | | | | | | | | | | | | | | too early * commit '9313bee990b014afd6b1d66b0f802f9a36792c7f': Do not initialize SSLSocketFactory too early
| | | | * am 40ff03b8: am 8868084e: Do not initialize SSLSocketFactory too earlyKenny Root2013-08-131-6/+13
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | * commit '40ff03b8ad09a7452b6a4e0916ce404ad31afc34': Do not initialize SSLSocketFactory too early
| | | | | * am 8868084e: Do not initialize SSLSocketFactory too earlyKenny Root2013-08-131-6/+13
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8868084e528a9f77ebeee5b4c20416ca9939b471': Do not initialize SSLSocketFactory too early
| | | | | | * Do not initialize SSLSocketFactory too earlyKenny Root2013-08-131-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During Zygote initialization, the class may be preloaded. However we do not want the default instances of SSLSocketFactory initialized, so move those into a holder class so they are only initialized when used. (cherry picked from commit 72017834153711733905dfcf4bfe7b802062692b) Bug: 9984058 Change-Id: Ied901aa97dbbf0f7439f317d21d4b715b5705d96
* | | | | | | am 371c83ff: (-s ours) am 5751d48a: (-s ours) Do not initialize ↵Kenny Root2013-08-130-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SSLSocketFactory too early DO NOT MERGE * commit '371c83ffde6c3836430843b99c2d34e17e25db7a': Do not initialize SSLSocketFactory too early DO NOT MERGE
| * | | | | | am 5751d48a: (-s ours) Do not initialize SSLSocketFactory too early DO NOT MERGEKenny Root2013-08-130-0/+0
|/| | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '5751d48a39c69ac6bbb9b5e0839f01e951bc48e9': Do not initialize SSLSocketFactory too early DO NOT MERGE
| * / / / / Do not initialize SSLSocketFactory too early DO NOT MERGEKenny Root2013-08-131-6/+13
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During Zygote initialization, the class may be preloaded. However we do not want the default instances of SSLSocketFactory initialized, so move those into a holder class so they are only initialized when used. (cherry picked from commit 72017834153711733905dfcf4bfe7b802062692b) Bug: 9984058 Change-Id: I245d3d075c8c3476e9f76579ef7141e447f92011
* / / / / Do not initialize SSLSocketFactory too earlyKenny Root2013-07-231-6/+13
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During Zygote initialization, the class may be preloaded. However we do not want the default instances of SSLSocketFactory initialized, so move those into a holder class so they are only initialized when used. Bug: 9984058 Change-Id: Icf91f4fb60b7e4e5e9fbb22def01073dc1663128
* | | | Merge "Simplify makefile."Elliott Hughes2012-12-041-2/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Simplify makefile.Elliott Hughes2012-12-041-2/+0
|/ / / | | | | | | | | | Change-Id: Idab981e1534d4a3f3f1c24dae1ca34859b41ee52
* | | am e6fe5ecb: Merge "Remove obsolete ThirdPartyProject.prop files."cm-10.1.3-RC2cm-10.1.3-RC1cm-10.1.3cm-10.1.2cm-10.1.1cm-10.1.0-RC5cm-10.1.0-RC4cm-10.1.0-RC3cm-10.1.0-RC2cm-10.1.0-RC1cm-10.1.0cm-10.1-M3cm-10.1-M2cm-10.1-M1mr1.1-stagingcm-10.1Elliott 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.jellybean-stablejellybeanJesse 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 DefaultRequestDirectorics-releaseicscm-9.1.0Jesse 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.