aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/publish.yml8
-rw-r--r--CHANGELOG.md7
-rw-r--r--Cargo.lock90
-rw-r--r--Cargo.toml2
-rw-r--r--Cross.toml3
-rw-r--r--README.md2
-rw-r--r--src/renderer.rs2
7 files changed, 73 insertions, 41 deletions
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 05f1730..53480cd 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -23,6 +23,7 @@ jobs:
- riscv64gc-unknown-linux-gnu
- x86_64-pc-windows-msvc
- x86_64-apple-darwin
+ - x86_64-unknown-freebsd
include:
- os: ubuntu-latest
target: x86_64-unknown-linux-musl
@@ -101,6 +102,13 @@ jobs:
cross: false
strip: true
compress: true
+ - os: ubuntu-latest
+ target: x86_64-unknown-freebsd
+ artifact_name: target/x86_64-unknown-freebsd/release/miniserve
+ release_name: x86_64-unknown-freebsd
+ cross: true
+ strip: false
+ compress: false
steps:
- name: Checkout code
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5efb182..a126f26 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
## [Unreleased] - ReleaseDate
+## [0.12.1] - 2021-03-27
+- Fix QR code not showing when using both `--random-route` and `--qrcode` [#480](https://github.com/svenstaro/miniserve/pull/480) (thanks @rouge8)
+- Add FreeBSD binaries
+
## [0.12.0] - 2021-03-20
- Add option `-H`/`--hidden` to show hidden files
- Start instantly in case an explicit index is chosen
@@ -69,7 +73,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- Some theme related bug fixes (thanks @boastful-squirrel)
<!-- next-url -->
-[Unreleased]: https://github.com/svenstaro/miniserve/compare/v0.12.0...HEAD
+[Unreleased]: https://github.com/svenstaro/miniserve/compare/v0.12.1...HEAD
+[0.12.1]: https://github.com/svenstaro/miniserve/compare/v0.12.0...v0.12.1
[0.12.0]: https://github.com/svenstaro/miniserve/compare/v0.11.0...v0.12.0
[0.11.0]: https://github.com/svenstaro/miniserve/compare/v0.10.4...v0.11.0
[0.10.4]: https://github.com/svenstaro/miniserve/compare/v0.10.3...v0.10.4
diff --git a/Cargo.lock b/Cargo.lock
index 7493ace..df4bb1d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -93,7 +93,7 @@ dependencies = [
"log",
"mime",
"percent-encoding",
- "pin-project 1.0.5",
+ "pin-project 1.0.6",
"rand 0.7.3",
"regex",
"serde",
@@ -177,7 +177,7 @@ dependencies = [
"mio-uds",
"num_cpus",
"slab",
- "socket2",
+ "socket2 0.3.19",
]
[[package]]
@@ -201,7 +201,7 @@ dependencies = [
"actix-server",
"actix-service",
"log",
- "socket2",
+ "socket2 0.3.19",
]
[[package]]
@@ -279,12 +279,12 @@ dependencies = [
"fxhash",
"log",
"mime",
- "pin-project 1.0.5",
+ "pin-project 1.0.6",
"regex",
"serde",
"serde_json",
"serde_urlencoded",
- "socket2",
+ "socket2 0.3.19",
"time 0.2.26",
"tinyvec",
"url",
@@ -668,6 +668,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28b9d6de7f49e22cf97ad17fc4036ece69300032f45f78f30b4a4482cdc3f4a6"
[[package]]
+name = "convert_case"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
+
+[[package]]
name = "cookie"
version = "0.14.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -712,9 +718,9 @@ dependencies = [
[[package]]
name = "ctor"
-version = "0.1.19"
+version = "0.1.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8f45d9ad417bcef4817d614a501ab55cdd96a6fdb24f49aab89a54acfd66b19"
+checksum = "5e98e2ad1a782e33928b96fc3948e7c355e5af34ba4de7670fe8bac2a3b2006d"
dependencies = [
"quote",
"syn",
@@ -722,10 +728,11 @@ dependencies = [
[[package]]
name = "derive_more"
-version = "0.99.11"
+version = "0.99.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41cb0e6161ad61ed084a36ba71fbba9e3ac5aee3606fb607fe08da6acbcf3d8c"
+checksum = "f82b1b72f1263f214c0f823371768776c4f5841b942c9883aa8e5ec584fd0ba6"
dependencies = [
+ "convert_case",
"proc-macro2",
"quote",
"syn",
@@ -1071,9 +1078,9 @@ dependencies = [
[[package]]
name = "h2"
-version = "0.3.1"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d832b01df74254fe364568d6ddc294443f61cbec82816b60904303af87efae78"
+checksum = "fc018e188373e2777d0ef2467ebff62a08e66c3f5857b23c8fbec3018210dc00"
dependencies = [
"bytes 1.0.1",
"fnv",
@@ -1189,22 +1196,22 @@ checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47"
[[package]]
name = "hyper"
-version = "0.14.4"
+version = "0.14.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8e946c2b1349055e0b72ae281b238baf1a3ea7307c7e9f9d64673bdd9c26ac7"
+checksum = "8bf09f61b52cfcf4c00de50df88ae423d6c02354e385a86341133b5338630ad1"
dependencies = [
"bytes 1.0.1",
"futures-channel",
"futures-core",
"futures-util",
- "h2 0.3.1",
+ "h2 0.3.2",
"http",
"http-body",
"httparse",
"httpdate",
"itoa",
- "pin-project 1.0.5",
- "socket2",
+ "pin-project 1.0.6",
+ "socket2 0.4.0",
"tokio 1.4.0",
"tower-service",
"tracing",
@@ -1289,7 +1296,7 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7e2f18aece9709094573a9f24f483c4f65caa4298e2f7ae1b71cc65d853fad7"
dependencies = [
- "socket2",
+ "socket2 0.3.19",
"widestring",
"winapi 0.3.9",
"winreg 0.6.2",
@@ -1349,9 +1356,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "libc"
-version = "0.2.90"
+version = "0.2.91"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba4aede83fc3617411dc6993bc8c70919750c1c257c6ca6a502aed6e0e2394ae"
+checksum = "8916b1f6ca17130ec6568feccee27c156ad12037880833a3b842a823236502e7"
[[package]]
name = "libflate"
@@ -1506,7 +1513,7 @@ dependencies = [
[[package]]
name = "miniserve"
-version = "0.12.1-alpha.0"
+version = "0.12.2-alpha.0"
dependencies = [
"actix-files",
"actix-multipart",
@@ -1580,13 +1587,13 @@ dependencies = [
[[package]]
name = "mio"
-version = "0.7.10"
+version = "0.7.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2182a122f3b7f3f5329cb1972cee089ba2459a0a80a56935e6e674f096f8d839"
+checksum = "cf80d3e903b34e0bd7282b218398aec54e082c840d9baf8339e0080a0c542956"
dependencies = [
"libc",
"log",
- "miow 0.3.6",
+ "miow 0.3.7",
"ntapi",
"winapi 0.3.9",
]
@@ -1616,11 +1623,10 @@ dependencies = [
[[package]]
name = "miow"
-version = "0.3.6"
+version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897"
+checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21"
dependencies = [
- "socket2",
"winapi 0.3.9",
]
@@ -1862,11 +1868,11 @@ dependencies = [
[[package]]
name = "pin-project"
-version = "1.0.5"
+version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96fa8ebb90271c4477f144354485b8068bd8f6b78b428b01ba892ca26caf0b63"
+checksum = "bc174859768806e91ae575187ada95c91a29e96a98dc5d2cd9a1fed039501ba6"
dependencies = [
- "pin-project-internal 1.0.5",
+ "pin-project-internal 1.0.6",
]
[[package]]
@@ -1882,9 +1888,9 @@ dependencies = [
[[package]]
name = "pin-project-internal"
-version = "1.0.5"
+version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "758669ae3558c6f74bd2a18b41f7ac0b5a195aea6639d6a9b5e5d1ad5ba24c0b"
+checksum = "a490329918e856ed1b083f244e3bfe2d8c4f336407e4ea9e1a9f479ff09049e5"
dependencies = [
"proc-macro2",
"quote",
@@ -2601,6 +2607,16 @@ dependencies = [
]
[[package]]
+name = "socket2"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e3dfc207c526015c632472a77be09cf1b6e46866581aecae5cc38fb4235dea2"
+dependencies = [
+ "libc",
+ "winapi 0.3.9",
+]
+
+[[package]]
name = "spin"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2739,9 +2755,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "1.0.64"
+version = "1.0.65"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fd9d1e9976102a03c542daa2eff1b43f9d72306342f3f8b3ed5fb8908195d6f"
+checksum = "f3a1d708c221c5a612956ef9f75b37e454e88d1f7b899fbd3a18d4252012d663"
dependencies = [
"proc-macro2",
"quote",
@@ -2934,7 +2950,7 @@ dependencies = [
"bytes 1.0.1",
"libc",
"memchr",
- "mio 0.7.10",
+ "mio 0.7.11",
"num_cpus",
"pin-project-lite 0.2.6",
]
@@ -3011,7 +3027,7 @@ version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2"
dependencies = [
- "pin-project 1.0.5",
+ "pin-project 1.0.6",
"tracing",
]
@@ -3224,9 +3240,9 @@ dependencies = [
[[package]]
name = "walkdir"
-version = "2.3.1"
+version = "2.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
+checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
dependencies = [
"same-file",
"winapi 0.3.9",
diff --git a/Cargo.toml b/Cargo.toml
index 1e5da8b..d02617e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "miniserve"
-version = "0.12.1-alpha.0"
+version = "0.12.2-alpha.0"
description = "For when you really just want to serve some files over HTTP right now!"
authors = ["Sven-Hendrik Haase <svenstaro@gmail.com>", "Boastful Squirrel <boastful.squirrel@gmail.com>"]
repository = "https://github.com/svenstaro/miniserve"
diff --git a/Cross.toml b/Cross.toml
new file mode 100644
index 0000000..a7a84ad
--- /dev/null
+++ b/Cross.toml
@@ -0,0 +1,3 @@
+# NOTE: Custom image specification for freebsd is required until new version of cross is released.
+[target.x86_64-unknown-freebsd]
+image = "rustembedded/cross:x86_64-unknown-freebsd"
diff --git a/README.md b/README.md
index 4c096d0..9e1eb7e 100644
--- a/README.md
+++ b/README.md
@@ -72,7 +72,7 @@ Sometimes this is just a more practical and quick way than doing things properly
## Usage
- miniserve 0.12.0
+ miniserve 0.12.1
Sven-Hendrik Haase <svenstaro@gmail.com>, Boastful Squirrel <boastful.squirrel@gmail.com>
For when you really just want to serve some files over HTTP right now!
diff --git a/src/renderer.rs b/src/renderer.rs
index b3b60cd..c9ec9cd 100644
--- a/src/renderer.rs
+++ b/src/renderer.rs
@@ -192,7 +192,7 @@ fn color_scheme_selector(show_qrcode: bool) -> Markup {
nav {
@if show_qrcode {
div {
- p onmouseover="document.querySelector('#qrcode').src = `/?qrcode=${encodeURIComponent(window.location.href)}`" {
+ p onmouseover="document.querySelector('#qrcode').src = `?qrcode=${encodeURIComponent(window.location.href)}`" {
"QR code"
}
div.qrcode {
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-04 23:28:16 +0000