Skip to content

Commit 74b77b2

Browse files
committed
Dual license under MIT/APACHE the source code
This change is done for two reasons: - First, the Rust port is, as of the time of writing in an awkward position because he is dual license under MIT/APACHE instead of only the APACHE license. This change in license should fix this problem. - Second, and the most convincing reason is that there have been some discussion with the Rust Libs Team to integrate the Rust port directly into the Rust standard library. The license change is required because the code for every the Rust repository need's to dual license against MIT/APACHE.
1 parent 5a9e3e6 commit 74b77b2

File tree

3 files changed

+38
-0
lines changed

3 files changed

+38
-0
lines changed

LICENSE renamed to LICENSE-APACHE

File renamed without changes.

LICENSE-MIT

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
Permission is hereby granted, free of charge, to any
2+
person obtaining a copy of this software and associated
3+
documentation files (the "Software"), to deal in the
4+
Software without restriction, including without
5+
limitation the rights to use, copy, modify, merge,
6+
publish, distribute, sublicense, and/or sell copies of
7+
the Software, and to permit persons to whom the Software
8+
is furnished to do so, subject to the following
9+
conditions:
10+
11+
The above copyright notice and this permission notice
12+
shall be included in all copies or substantial portions
13+
of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
16+
ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
17+
TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
18+
PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
19+
SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
20+
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
21+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
22+
IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23+
DEALINGS IN THE SOFTWARE.

README.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,3 +150,18 @@ invaluable feedback. Rémy Oudompheng first implemented a fast path we use in th
150150

151151
The library includes code adapted from Google Wuffs (written by Nigel Tao) which was originally published
152152
under the Apache 2.0 license.
153+
154+
## License
155+
156+
<sup>
157+
Licensed under either of <a href="LICENSE-APACHE">Apache License, Version
158+
2.0</a> or <a href="LICENSE-MIT">MIT license</a> at your option.
159+
</sup>
160+
161+
<br>
162+
163+
<sub>
164+
Unless you explicitly state otherwise, any contribution intentionally submitted
165+
for inclusion in this repository by you, as defined in the Apache-2.0 license,
166+
shall be dual licensed as above, without any additional terms or conditions.
167+
</sub>

0 commit comments

Comments
 (0)