This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-php.git
The following commit(s) were added to refs/heads/master by this push:
new 3d61f49 Add TLS (#112)
3d61f49 is described below
commit 3d61f49eda1bd41704be824ca62fc3b22e299143
Author: 何延龙 <hey.yanl...@gmail.com>
AuthorDate: Sat Jun 22 23:55:22 2024 +0800
Add TLS (#112)
---
Cargo.toml | 2 +-
dist-material/LICENSE | 1 +
.../licenses/LICENSE-rustls-native-certs.txt | 25 ++++++++++++++++++++++
3 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/Cargo.toml b/Cargo.toml
index 5647050..e649255 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -54,7 +54,7 @@ systemstat = "0.2.3"
thiserror = "1.0.44"
tokio = { version = "1.29.1", features = ["full"] }
tokio-stream = "0.1.14"
-tonic = { version = "0.8.3", features = ["tls"] }
+tonic = { version = "0.8.3", features = ["tls", "tls-roots"] }
tracing = { version = "0.1.37", features = ["attributes"] }
tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
url = "2.4.0"
diff --git a/dist-material/LICENSE b/dist-material/LICENSE
index 68c8299..9813e8a 100644
--- a/dist-material/LICENSE
+++ b/dist-material/LICENSE
@@ -259,6 +259,7 @@ The following components are provided under the Apache-2.0
OR ISC OR MIT License
The text of each license is also included in licenses/LICENSE-[project].txt.
https://crates.io/crates/rustls/0.20.8 0.20.8 Apache-2.0 OR ISC OR MIT
+ https://crates.io/crates/rustls-native-certs/0.6.3 0.6.3 Apache-2.0 OR ISC
OR MIT
https://crates.io/crates/rustls-pemfile/1.0.3 1.0.3 Apache-2.0 OR ISC OR
MIT
https://crates.io/crates/sct/0.7.0 0.7.0 Apache-2.0 OR ISC OR MIT
diff --git a/dist-material/licenses/LICENSE-rustls-native-certs.txt
b/dist-material/licenses/LICENSE-rustls-native-certs.txt
new file mode 100644
index 0000000..b4000f9
--- /dev/null
+++ b/dist-material/licenses/LICENSE-rustls-native-certs.txt
@@ -0,0 +1,25 @@
+Copyright (c) 2016 Joseph Birr-Pixton <jpix...@gmail.com>
+
+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.
\ No newline at end of file
