Merge pull request #296 from atouchet/lic

Use SPDX license format and update links

Cargo.toml

@@ -3,7 +3,7 @@ name = "flate2"
 authors = ["Alex Crichton <alex@alexcrichton.com>", "Josh Triplett <josh@joshtriplett.org>"]
 version = "1.0.24"
 edition = "2018"
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 readme = "README.md"
 keywords = ["gzip", "deflate", "zlib", "zlib-ng", "encoding"]
 categories = ["compression", "api-bindings"]

README.md

@@ -87,7 +87,7 @@ See [the libz-sys
 README](https://github.com/rust-lang/libz-sys/blob/main/README.md) for details.
 To avoid that, use the `"zlib-ng"` feature instead.
 
-For compatibility with previous versions of `flate2`, the cloudflare optimized
+For compatibility with previous versions of `flate2`, the Cloudflare optimized
 version of zlib is available, via the `cloudflare_zlib` feature. It's not as
 fast as zlib-ng, but it's faster than stock zlib. It requires an x86-64 CPU with
 SSE 4.2 or ARM64 with NEON & CRC. It does not support 32-bit CPUs at all and is
@@ -101,9 +101,9 @@ uses another version of zlib/libz.
 This project is licensed under either of
 
  * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
-   http://www.apache.org/licenses/LICENSE-2.0)
+   https://www.apache.org/licenses/LICENSE-2.0)
  * MIT license ([LICENSE-MIT](LICENSE-MIT) or
-   http://opensource.org/licenses/MIT)
+   https://opensource.org/licenses/MIT)
 
 at your option.
 

src/bufreader.rs

@@ -1,10 +1,10 @@
 // Copyright 2013 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
+// <https://github.com/rust-lang/rust/blob/HEAD/COPYRIGHT>.
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.