Merge branch 'master' into headers_encoding

Author: joseluisq

.github/workflows/ci.yml

@@ -0,0 +1,59 @@
+name: CI
+
+on: [push, pull_request]
+
+env:
+  minrust: 1.41.0
+
+jobs:
+  test:
+    name: Test
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        rust: [stable, beta, nightly]
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: ${{ matrix.rust }}
+          profile: minimal
+          override: true
+
+      - name: cargo test --all
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: --all
+      - name: cargo test --benches
+        if: matrix.rust == 'nightly'
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: --benches
+
+      - name: Check minimal versions
+        if: matrix.rust == 'nightly'
+        run: |
+          cargo clean
+          cargo update -Z minimal-versions
+          cargo check
+
+  MSRV:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install rust ${{ env.minrust }}
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: ${{ env.minrust }}
+          profile: minimal
+          override: true
+
+      - name: cargo build
+        uses: actions-rs/cargo@v1
+        with:
+          command: build

.travis.yml

@@ -1,6 +1,6 @@
 [package]
 name = "headers"
-version = "0.3.2" # don't forget to update html_root_url
+version = "0.3.4" # don't forget to update html_root_url
 description = "typed HTTP headers"
 license = "MIT"
 readme = "README.md"
@@ -19,12 +19,12 @@ members = [
 [dependencies]
 http = "0.2.0"
 headers-core = { version = "0.2", path = "./headers-core" }
-base64 = "0.12"
+base64 = "0.13"
 bitflags = "1.0"
-bytes = "0.5"
 itertools = "0.9"
+bytes = "1"
 mime = "0.3.14"
-sha-1 = "0.8"
+sha-1 = "0.9"
 time = "0.1.34"
 
 [features]

Cargo.toml

@@ -1,5 +1,5 @@
 # rust http headers
 
-[![Build Status](https://travis-ci.org/hyperium/headers.svg?branch=master)](https://travis-ci.org/hyperium/header)
+[![Build Status](https://github.com/hyperium/headers/workflows/CI/badge.svg)](https://github.com/hyperium/headers/actions?query=workflow%3ACI)
 
 Typed HTTP headers.

README.md

@@ -5,7 +5,7 @@ use http::header::HeaderValue;
 /// `Referer` header, defined in
 /// [RFC7231](http://tools.ietf.org/html/rfc7231#section-5.5.2)
 ///
-/// The `Referer` [sic] header field allows the user agent to specify a
+/// The `Referer` \[sic\] header field allows the user agent to specify a
 /// URI reference for the resource from which the target URI was obtained
 /// (i.e., the "referrer", though the field name is misspelled).  A user
 /// agent MUST NOT include the fragment and userinfo components of the

src/common/referer.rs

@@ -37,9 +37,9 @@ impl From<SecWebsocketKey> for SecWebsocketAccept {
 
 fn sign(key: &[u8]) -> SecWebsocketAccept {
     let mut sha1 = Sha1::default();
-    sha1.input(key);
-    sha1.input(&b"258EAFA5-E914-47DA-95CA-C5AB0DC85B11"[..]);
-    let b64 = Bytes::from(base64::encode(&sha1.result()));
+    sha1.update(key);
+    sha1.update(&b"258EAFA5-E914-47DA-95CA-C5AB0DC85B11"[..]);
+    let b64 = Bytes::from(base64::encode(&sha1.finalize()));
 
     let val = ::HeaderValue::from_maybe_shared(b64).expect("base64 is a valid value");
 

src/common/sec_websocket_accept.rs

@@ -2,7 +2,7 @@
 #![deny(missing_debug_implementations)]
 #![cfg_attr(test, deny(warnings))]
 #![cfg_attr(all(test, feature = "nightly"), feature(test))]
-#![doc(html_root_url = "https://docs.rs/headers/0.3.2")]
+#![doc(html_root_url = "https://docs.rs/headers/0.3.4")]
 
 //! # Typed HTTP Headers
 //!