aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md1
-rw-r--r--Cargo.lock13
-rw-r--r--Cargo.toml2
-rw-r--r--README.md14
4 files changed, 24 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index df2dd4b..09075bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
<!-- next-header -->
## [Unreleased] - ReleaseDate
+- Fix panic when using TLS in some instances [#670](https://github.com/svenstaro/miniserve/issues/670) (thanks @aliemjay)
## [0.18.0] - 2021-10-26
- Add raw mode and raw mode footer display [#508](https://github.com/svenstaro/miniserve/pull/508) (thanks @Jikstra)
diff --git a/Cargo.lock b/Cargo.lock
index cec1d8f..67362ab 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1437,7 +1437,7 @@ dependencies = [
"reqwest",
"rstest",
"rustls",
- "rustls-pemfile",
+ "rustls-pemfile 0.3.0",
"select",
"serde",
"sha2",
@@ -2029,7 +2029,7 @@ dependencies = [
"percent-encoding",
"pin-project-lite",
"rustls",
- "rustls-pemfile",
+ "rustls-pemfile 0.2.1",
"serde",
"serde_json",
"serde_urlencoded",
@@ -2108,6 +2108,15 @@ dependencies = [
]
[[package]]
+name = "rustls-pemfile"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ee86d63972a7c661d1536fefe8c3c8407321c3df668891286de28abcd087360"
+dependencies = [
+ "base64",
+]
+
+[[package]]
name = "rustversion"
version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/Cargo.toml b/Cargo.toml
index 9438e7c..dbfdbe3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -51,7 +51,7 @@ httparse = "1"
http = "0.2"
atty = "0.2"
rustls = { version = "0.20", optional = true }
-rustls-pemfile = { version = "0.2", optional = true }
+rustls-pemfile = { version = "0.3", optional = true }
socket2 = "0.4"
get_if_addrs = "0.5"
diff --git a/README.md b/README.md
index a2dea4a..08ce928 100644
--- a/README.md
+++ b/README.md
@@ -225,7 +225,7 @@ On [Termux](https://termux.com/)
chmod +x miniserve-osx
./miniserve-osx
-Alternatively install with [Homebrew](https://brew.sh/).
+Alternatively install with [Homebrew](https://brew.sh/):
brew install miniserve
miniserve
@@ -234,14 +234,22 @@ Alternatively install with [Homebrew](https://brew.sh/).
miniserve-win.exe
+Alternatively install with [Scoop](https://scoop.sh/):
+
+ scoop install miniserve
+
**With Cargo**: Make sure you have a recent version of Rust. Then you can run
cargo install --locked miniserve
miniserve
-**With Docker:** If you prefer using Docker for this, run
+**With Docker:** Make sure the Docker daemon is running and then run
+
+ docker run -v /tmp:/tmp -p 8080:8080 --rm -it docker.io/svenstaro/miniserve /tmp
+
+**With Podman:** Just run
- docker run -v /tmp:/tmp -p 8080:8080 --rm -it svenstaro/miniserve /tmp
+ podman run -v /tmp:/tmp -p 8080:8080 --rm -it docker.io/svenstaro/miniserve /tmp
## Shell completions