micropelago/tokio-rustls
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clarify the license

Browse Source 
Before this PR, this phrasing appears to have been copied from
the [rust project](f0fe716dbc (license)),
but it does not appear that any of your code is BSD licensed.
Also, it is a little ambigious if there are portions that are not
covered by MIT/Apache.

This patch instead draws it's phrasing from
[futures-rs](https://github.com/rust-lang-nursery/futures-rs). Does
this phrasing align  more with what you intended?

Closes #29
This commit is contained in:
Erick Tryzelaar 2019-03-12 09:40:54 -07:00
parent 485cf84639
commit ee59a7cc8e
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
README.md
View File

@ -48,8 +48,19 @@ cargo run -- 127.0.0.1 --cert mycert.der --key mykey.der
### License & Origin ### License & Origin
tokio-rustls is primarily distributed under the terms of both the [MIT license](LICENSE-MIT) and This project is licensed under either of
the [Apache License (Version 2.0)](LICENSE-APACHE), with portions covered by various BSD-like
licenses. * 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.
This started as a fork of [tokio-tls](https://github.com/tokio-rs/tokio-tls). This started as a fork of [tokio-tls](https://github.com/tokio-rs/tokio-tls).
### Contribution
Unless you explicitly state otherwise, any contribution intentionally submitted
for inclusion in tokio-rustls by you, as defined in the Apache-2.0 license, shall be
dual licensed as above, without any additional terms or conditions.