Merge remote-tracking branch 'origin/upstream' am: 01030d454c
Original change: undetermined
Change-Id: Ia5e5cd79a0810d921fdd8e6cbc793cf3b8d39098
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..a8518ca
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,43 @@
+// This file is generated by cargo_embargo.
+// Do not modify this file after the first "rust_*" or "genrule" module
+// because the changes will be overridden on upgrade.
+// Content before the first "rust_*" or "genrule" module is preserved.
+
+package {
+ default_applicable_licenses: ["external_rust_crates_libhyper_timeout_license"],
+}
+
+license {
+ name: "external_rust_crates_libhyper_timeout_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-Apache-2.0",
+ "SPDX-license-identifier-MIT",
+ ],
+ license_text: [
+ "LICENSE-APACHE",
+ "LICENSE-MIT",
+ ],
+}
+
+rust_library {
+ name: "libhyper_timeout",
+ host_supported: true,
+ crate_name: "hyper_timeout",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.4.1",
+ crate_root: "src/lib.rs",
+ edition: "2018",
+ rustlibs: [
+ "libhyper",
+ "libpin_project_lite",
+ "libtokio",
+ "libtokio_io_timeout",
+ ],
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
+ product_available: true,
+ vendor_available: true,
+}
diff --git a/Cargo.toml b/Cargo.toml
new file mode 100644
index 0000000..3d9bcff
--- /dev/null
+++ b/Cargo.toml
@@ -0,0 +1,45 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g., crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+edition = "2018"
+name = "hyper-timeout"
+version = "0.4.1"
+authors = ["Herman J. Radtke III <[email protected]>"]
+description = "A connect, read and write timeout aware connector to be used with hyper Client."
+homepage = "https://github.com/hjr3/hyper-timeout"
+documentation = "https://github.com/hjr3/hyper-timeout"
+readme = "README.md"
+license = "MIT/Apache-2.0"
+repository = "https://github.com/hjr3/hyper-timeout"
+[dependencies.hyper]
+version = "0.14.2"
+features = ["client"]
+
+[dependencies.pin-project-lite]
+version = "0.2"
+
+[dependencies.tokio]
+version = "1.0.0"
+
+[dependencies.tokio-io-timeout]
+version = "1.1.0"
+[dev-dependencies.hyper]
+version = "0.14"
+features = ["client", "http1", "tcp"]
+
+[dev-dependencies.hyper-tls]
+version = "0.5"
+
+[dev-dependencies.tokio]
+version = "1.0.0"
+features = ["io-std", "io-util", "macros"]
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
new file mode 100644
index 0000000..ecfa8ca
--- /dev/null
+++ b/Cargo.toml.orig
@@ -0,0 +1,22 @@
+[package]
+name = "hyper-timeout"
+version = "0.4.1"
+authors = ["Herman J. Radtke III <[email protected]>"]
+edition = "2018"
+description = "A connect, read and write timeout aware connector to be used with hyper Client."
+license = "MIT/Apache-2.0"
+documentation = "https://github.com/hjr3/hyper-timeout"
+homepage = "https://github.com/hjr3/hyper-timeout"
+repository = "https://github.com/hjr3/hyper-timeout"
+readme = "README.md"
+
+[dependencies]
+hyper = { version = "0.14.2", features = ["client"] }
+pin-project-lite = "0.2"
+tokio = "1.0.0"
+tokio-io-timeout = "1.1.0"
+
+[dev-dependencies]
+hyper = { version = "0.14", features = ["client", "http1", "tcp"] }
+hyper-tls = "0.5"
+tokio = { version = "1.0.0", features = ["io-std", "io-util", "macros"] }
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..699141f
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,225 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+-----
+
+The MIT License (MIT)
+
+Copyright (c) 2016 The weldr Project Developers
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/LICENSE-APACHE b/LICENSE-APACHE
new file mode 100644
index 0000000..16fe87b
--- /dev/null
+++ b/LICENSE-APACHE
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/LICENSE-MIT b/LICENSE-MIT
new file mode 100644
index 0000000..af19a90
--- /dev/null
+++ b/LICENSE-MIT
@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 The weldr Project Developers
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..076e13c
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,21 @@
+name: "hyper-timeout"
+description: "A connect, read and write timeout aware connector to be used with hyper Client."
+third_party {
+ identifier {
+ type: "crates.io"
+ value: "hyper-timeout"
+ }
+ identifier {
+ type: "Archive"
+ value: "https://static.crates.io/crates/hyper-timeout/hyper-timeout-0.4.1.crate"
+ primary_source: true
+ }
+ version: "0.4.1"
+ # Dual-licensed, using the least restrictive per go/thirdpartylicenses#same.
+ license_type: NOTICE
+ last_upgrade_date {
+ year: 2024
+ month: 6
+ day: 3
+ }
+}
diff --git a/MODULE_LICENSE_APACHE2 b/MODULE_LICENSE_APACHE2
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/MODULE_LICENSE_APACHE2
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..48bea6e
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,2 @@
+# Bug component: 688011
+include platform/prebuilts/rust:main:/OWNERS
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..6c34c76
--- /dev/null
+++ b/README.md
@@ -0,0 +1,47 @@
+[](https://crates.io/crates/hyper-timeout)
+
+# hyper-timeout
+
+A connect, read and write timeout aware connector to be used with hyper `Client`.
+
+## Problem
+
+At the time this crate was created, hyper does not support timeouts. There is a way to do general timeouts, but no easy way to get connect, read and write specific timeouts.
+
+## Solution
+
+There is a `TimeoutConnector` that implements the `hyper::Connect` trait. This connector wraps around `HttpConnector` or `HttpsConnector` values and provides timeouts.
+
+**Note:** In hyper 0.11, a read or write timeout will return a _broken pipe_ error because of the way `tokio_proto::ClientProto` works
+
+## Usage
+
+Hyper version compatibility:
+
+* The `master` branch will track on going development for hyper.
+* The `0.4` release supports hyper 0.14.
+* The `0.3` release supports hyper 0.13.
+* The `0.2` release supports hyper 0.12.
+* The `0.1` release supports hyper 0.11.
+
+Assuming you are using hyper 0.14, add this to your `Cargo.toml`:
+
+```toml
+[dependencies]
+hyper-timeout = "0.4"
+```
+
+See the [client example](./examples/client.rs) for a working example.
+
+## License
+
+Licensed under either of
+ * Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
+ * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
+at your option.
+
+### Contribution
+
+Unless you explicitly state otherwise, any contribution intentionally submitted
+for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any
+additional terms or conditions.
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..0cb0b25
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,3 @@
+{
+ "run_cargo": false
+}
\ No newline at end of file
diff --git a/examples/client.rs b/examples/client.rs
new file mode 100644
index 0000000..4c39189
--- /dev/null
+++ b/examples/client.rs
@@ -0,0 +1,43 @@
+use std::env;
+use std::time::Duration;
+
+use hyper::{body::HttpBody as _, Client};
+use tokio::io::{self, AsyncWriteExt as _};
+
+use hyper_tls::HttpsConnector;
+
+use hyper_timeout::TimeoutConnector;
+
+#[tokio::main(flavor = "current_thread")]
+async fn main() -> Result<(), Box<dyn std::error::Error>> {
+ let url = match env::args().nth(1) {
+ Some(url) => url,
+ None => {
+ println!("Usage: client <url>");
+ println!("Example: client https://example.com");
+ return Ok(());
+ }
+ };
+
+ let url = url.parse::<hyper::Uri>().unwrap();
+
+ // This example uses `HttpsConnector`, but you can also use hyper `HttpConnector`
+ //let h = hyper::client::HttpConnector::new();
+ let h = HttpsConnector::new();
+ let mut connector = TimeoutConnector::new(h);
+ connector.set_connect_timeout(Some(Duration::from_secs(5)));
+ connector.set_read_timeout(Some(Duration::from_secs(5)));
+ connector.set_write_timeout(Some(Duration::from_secs(5)));
+ let client = Client::builder().build::<_, hyper::Body>(connector);
+
+ let mut res = client.get(url).await?;
+
+ println!("Status: {}", res.status());
+ println!("Headers:\n{:#?}", res.headers());
+
+ while let Some(chunk) = res.body_mut().data().await {
+ let chunk = chunk?;
+ io::stdout().write_all(&chunk).await?
+ }
+ Ok(())
+}
diff --git a/src/lib.rs b/src/lib.rs
new file mode 100644
index 0000000..c2e4285
--- /dev/null
+++ b/src/lib.rs
@@ -0,0 +1,197 @@
+use std::future::Future;
+use std::io;
+use std::pin::Pin;
+use std::task::{Context, Poll};
+use std::time::Duration;
+
+use tokio::io::{AsyncRead, AsyncWrite};
+use tokio::time::timeout;
+use tokio_io_timeout::TimeoutStream;
+
+use hyper::client::connect::{Connected, Connection};
+use hyper::{service::Service, Uri};
+
+mod stream;
+
+use stream::TimeoutConnectorStream;
+
+type BoxError = Box<dyn std::error::Error + Send + Sync>;
+
+/// A connector that enforces as connection timeout
+#[derive(Debug, Clone)]
+pub struct TimeoutConnector<T> {
+ /// A connector implementing the `Connect` trait
+ connector: T,
+ /// Amount of time to wait connecting
+ connect_timeout: Option<Duration>,
+ /// Amount of time to wait reading response
+ read_timeout: Option<Duration>,
+ /// Amount of time to wait writing request
+ write_timeout: Option<Duration>,
+}
+
+impl<T> TimeoutConnector<T>
+where
+ T: Service<Uri> + Send,
+ T::Response: AsyncRead + AsyncWrite + Send + Unpin,
+ T::Future: Send + 'static,
+ T::Error: Into<BoxError>,
+{
+ /// Construct a new TimeoutConnector with a given connector implementing the `Connect` trait
+ pub fn new(connector: T) -> Self {
+ TimeoutConnector {
+ connector,
+ connect_timeout: None,
+ read_timeout: None,
+ write_timeout: None,
+ }
+ }
+}
+
+impl<T> Service<Uri> for TimeoutConnector<T>
+where
+ T: Service<Uri> + Send,
+ T::Response: AsyncRead + AsyncWrite + Connection + Send + Unpin,
+ T::Future: Send + 'static,
+ T::Error: Into<BoxError>,
+{
+ type Response = Pin<Box<TimeoutConnectorStream<T::Response>>>;
+ type Error = BoxError;
+ #[allow(clippy::type_complexity)]
+ type Future = Pin<Box<dyn Future<Output = Result<Self::Response, Self::Error>> + Send>>;
+
+ fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
+ self.connector.poll_ready(cx).map_err(Into::into)
+ }
+
+ fn call(&mut self, dst: Uri) -> Self::Future {
+ let connect_timeout = self.connect_timeout;
+ let read_timeout = self.read_timeout;
+ let write_timeout = self.write_timeout;
+ let connecting = self.connector.call(dst);
+
+ let fut = async move {
+ let stream = match connect_timeout {
+ None => {
+ let io = connecting.await.map_err(Into::into)?;
+ TimeoutStream::new(io)
+ }
+ Some(connect_timeout) => {
+ let timeout = timeout(connect_timeout, connecting);
+ let connecting = timeout
+ .await
+ .map_err(|e| io::Error::new(io::ErrorKind::TimedOut, e))?;
+ let io = connecting.map_err(Into::into)?;
+ TimeoutStream::new(io)
+ }
+ };
+
+ let mut tm = TimeoutConnectorStream::new(stream);
+ tm.set_read_timeout(read_timeout);
+ tm.set_write_timeout(write_timeout);
+ Ok(Box::pin(tm))
+ };
+
+ Box::pin(fut)
+ }
+}
+
+impl<T> TimeoutConnector<T> {
+ /// Set the timeout for connecting to a URL.
+ ///
+ /// Default is no timeout.
+ #[inline]
+ pub fn set_connect_timeout(&mut self, val: Option<Duration>) {
+ self.connect_timeout = val;
+ }
+
+ /// Set the timeout for the response.
+ ///
+ /// Default is no timeout.
+ #[inline]
+ pub fn set_read_timeout(&mut self, val: Option<Duration>) {
+ self.read_timeout = val;
+ }
+
+ /// Set the timeout for the request.
+ ///
+ /// Default is no timeout.
+ #[inline]
+ pub fn set_write_timeout(&mut self, val: Option<Duration>) {
+ self.write_timeout = val;
+ }
+}
+
+impl<T> Connection for TimeoutConnector<T>
+where
+ T: AsyncRead + AsyncWrite + Connection + Service<Uri> + Send + Unpin,
+ T::Response: AsyncRead + AsyncWrite + Send + Unpin,
+ T::Future: Send + 'static,
+ T::Error: Into<BoxError>,
+{
+ fn connected(&self) -> Connected {
+ self.connector.connected()
+ }
+}
+
+#[cfg(test)]
+mod tests {
+ use std::error::Error;
+ use std::io;
+ use std::time::Duration;
+
+ use hyper::client::HttpConnector;
+ use hyper::Client;
+
+ use super::TimeoutConnector;
+
+ #[tokio::test]
+ async fn test_timeout_connector() {
+ // 10.255.255.1 is a not a routable IP address
+ let url = "http://10.255.255.1".parse().unwrap();
+
+ let http = HttpConnector::new();
+ let mut connector = TimeoutConnector::new(http);
+ connector.set_connect_timeout(Some(Duration::from_millis(1)));
+
+ let client = Client::builder().build::<_, hyper::Body>(connector);
+
+ let res = client.get(url).await;
+
+ match res {
+ Ok(_) => panic!("Expected a timeout"),
+ Err(e) => {
+ if let Some(io_e) = e.source().unwrap().downcast_ref::<io::Error>() {
+ assert_eq!(io_e.kind(), io::ErrorKind::TimedOut);
+ } else {
+ panic!("Expected timeout error");
+ }
+ }
+ }
+ }
+
+ #[tokio::test]
+ async fn test_read_timeout() {
+ let url = "http://example.com".parse().unwrap();
+
+ let http = HttpConnector::new();
+ let mut connector = TimeoutConnector::new(http);
+ // A 1 ms read timeout should be so short that we trigger a timeout error
+ connector.set_read_timeout(Some(Duration::from_millis(1)));
+
+ let client = Client::builder().build::<_, hyper::Body>(connector);
+
+ let res = client.get(url).await;
+
+ match res {
+ Ok(_) => panic!("Expected a timeout"),
+ Err(e) => {
+ if let Some(io_e) = e.source().unwrap().downcast_ref::<io::Error>() {
+ assert_eq!(io_e.kind(), io::ErrorKind::TimedOut);
+ } else {
+ panic!("Expected timeout error");
+ }
+ }
+ }
+ }
+}
diff --git a/src/stream.rs b/src/stream.rs
new file mode 100644
index 0000000..dd1bd35
--- /dev/null
+++ b/src/stream.rs
@@ -0,0 +1,164 @@
+use std::io;
+use std::io::IoSlice;
+use std::pin::Pin;
+use std::task::{Context, Poll};
+use std::time::Duration;
+
+use hyper::client::connect::{Connected, Connection};
+use pin_project_lite::pin_project;
+use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
+use tokio_io_timeout::TimeoutStream;
+
+pin_project! {
+ /// A timeout stream that implements required traits to be a Connector
+ #[derive(Debug)]
+ pub struct TimeoutConnectorStream<S> {
+ #[pin]
+ stream: TimeoutStream<S>
+ }
+}
+
+impl<S> TimeoutConnectorStream<S>
+where
+ S: AsyncRead + AsyncWrite + Unpin,
+{
+ /// Returns a new `TimeoutConnectorStream` wrapping the specified stream.
+ ///
+ /// There is initially no read or write timeout.
+ pub fn new(stream: TimeoutStream<S>) -> TimeoutConnectorStream<S> {
+ TimeoutConnectorStream { stream }
+ }
+
+ /// Returns the current read timeout.
+ pub fn read_timeout(&self) -> Option<Duration> {
+ self.stream.read_timeout()
+ }
+
+ /// Sets the read timeout.
+ ///
+ /// This can only be used before the stream is pinned; use
+ /// [`set_read_timeout_pinned`](Self::set_read_timeout_pinned) otherwise.
+ pub fn set_read_timeout(&mut self, timeout: Option<Duration>) {
+ self.stream.set_read_timeout(timeout)
+ }
+
+ /// Sets the read timeout.
+ ///
+ /// This will reset any pending read timeout. Use
+ /// [`set_read_timeout`](Self::set_read_timeout) instead if the stream has not yet been pinned.
+ pub fn set_read_timeout_pinned(self: Pin<&mut Self>, timeout: Option<Duration>) {
+ self.project()
+ .stream
+ .as_mut()
+ .set_read_timeout_pinned(timeout)
+ }
+
+ /// Returns the current write timeout.
+ pub fn write_timeout(&self) -> Option<Duration> {
+ self.stream.write_timeout()
+ }
+
+ /// Sets the write timeout.
+ ///
+ /// This can only be used before the stream is pinned; use
+ /// [`set_write_timeout_pinned`](Self::set_write_timeout_pinned) otherwise.
+ pub fn set_write_timeout(&mut self, timeout: Option<Duration>) {
+ self.stream.set_write_timeout(timeout)
+ }
+
+ /// Sets the write timeout.
+ ///
+ /// This will reset any pending write timeout. Use
+ /// [`set_write_timeout`](Self::set_write_timeout) instead if the stream has not yet been
+ /// pinned.
+ pub fn set_write_timeout_pinned(self: Pin<&mut Self>, timeout: Option<Duration>) {
+ self.project()
+ .stream
+ .as_mut()
+ .set_write_timeout_pinned(timeout)
+ }
+
+ /// Returns a shared reference to the inner stream.
+ pub fn get_ref(&self) -> &S {
+ self.stream.get_ref()
+ }
+
+ /// Returns a mutable reference to the inner stream.
+ pub fn get_mut(&mut self) -> &mut S {
+ self.stream.get_mut()
+ }
+
+ /// Returns a pinned mutable reference to the inner stream.
+ pub fn get_pin_mut(self: Pin<&mut Self>) -> Pin<&mut S> {
+ self.project().stream.get_pin_mut()
+ }
+
+ /// Consumes the stream, returning the inner stream.
+ pub fn into_inner(self) -> S {
+ self.stream.into_inner()
+ }
+}
+
+impl<S> AsyncRead for TimeoutConnectorStream<S>
+where
+ S: AsyncRead + AsyncWrite + Unpin,
+{
+ fn poll_read(
+ self: Pin<&mut Self>,
+ cx: &mut Context,
+ buf: &mut ReadBuf,
+ ) -> Poll<Result<(), io::Error>> {
+ self.project().stream.poll_read(cx, buf)
+ }
+}
+
+impl<S> AsyncWrite for TimeoutConnectorStream<S>
+where
+ S: AsyncRead + AsyncWrite + Unpin,
+{
+ fn poll_write(
+ self: Pin<&mut Self>,
+ cx: &mut Context<'_>,
+ buf: &[u8],
+ ) -> Poll<Result<usize, io::Error>> {
+ self.project().stream.poll_write(cx, buf)
+ }
+
+ fn poll_write_vectored(
+ self: Pin<&mut Self>,
+ cx: &mut Context<'_>,
+ bufs: &[IoSlice<'_>],
+ ) -> Poll<Result<usize, io::Error>> {
+ self.project().stream.poll_write_vectored(cx, bufs)
+ }
+
+ fn is_write_vectored(&self) -> bool {
+ self.stream.is_write_vectored()
+ }
+
+ fn poll_flush(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), io::Error>> {
+ self.project().stream.poll_flush(cx)
+ }
+
+ fn poll_shutdown(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), io::Error>> {
+ self.project().stream.poll_shutdown(cx)
+ }
+}
+
+impl<S> Connection for TimeoutConnectorStream<S>
+where
+ S: AsyncRead + AsyncWrite + Connection + Unpin,
+{
+ fn connected(&self) -> Connected {
+ self.stream.get_ref().connected()
+ }
+}
+
+impl<S> Connection for Pin<Box<TimeoutConnectorStream<S>>>
+where
+ S: AsyncRead + AsyncWrite + Connection + Unpin,
+{
+ fn connected(&self) -> Connected {
+ self.stream.get_ref().connected()
+ }
+}
