Merge branch 'main' of https://six-five-six-four.com/git/reactor/ptth into main

Cargo.lock

@@ -13,7 +13,7 @@ dependencies = [
 
 [[package]]
 name = "always_equal"
-version = "1.0.2"
+version = "1.0.3"
 
 [[package]]
 name = "android_system_properties"
@@ -1330,7 +1330,7 @@ dependencies = [
 
 [[package]]
 name = "ptth_multi_call_server"
-version = "0.1.0"
+version = "1.1.1"
 dependencies = [
  "anyhow",
  "ctrlc",

Cargo.toml

@@ -7,6 +7,7 @@ edition = "2018"
 license = "AGPL-3.0"
 
 description = "An extroverted HTTP server that can run behind firewalls"
+repository = "https://six-five-six-four.com/git/reactor/ptth"
 readme = "README.md"
 keywords = ["http", "tunnel", "firewall"]
 categories = ["command-line-utilities", "web-programming::http-server"]

crates/always_equal/Cargo.toml

@@ -1,10 +1,11 @@
 [package]
 name = "always_equal"
-version = "1.0.2"
+version = "1.0.3"
 authors = ["Trish"]
 edition = "2018"
 license = "AGPL-3.0"
 
 description = "A wrapper for types that can't implement Eq"
+repository = "https://six-five-six-four.com/git/reactor/ptth"
 
 [dependencies]

crates/ptth_core/Cargo.toml

@@ -7,6 +7,7 @@ edition = "2018"
 license = "AGPL-3.0"
 
 description = "Common code for the PTTH relay and server"
+repository = "https://six-five-six-four.com/git/reactor/ptth"
 
 [dependencies]
 

crates/ptth_multi_call_server/Cargo.toml

@@ -1,6 +1,10 @@
 [package]
 name = "ptth_multi_call_server"
-version = "0.1.0"
+
+# Keep this synced with the Debian package name
+# dpkg doesn't let us do side-by-side versioning, shrug
+version = "1.1.1"
+
 authors = ["Trish"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -31,3 +35,9 @@ tracing = "0.1.25"
 version = "0.11.1" 
 default-features = false
 features = ["stream", "rustls-tls", "hyper-rustls"]
+
+[package.metadata.deb]
+assets = [
+    ["target/release/ptth_multi_call_server", "usr/bin/ptth_multi_call_server_1.1", "755"],
+]
+name = "ptth-multi-call-server-1.1"

crates/ptth_quic/Cargo.toml

@@ -5,6 +5,8 @@ authors = ["Trish"]
 edition = "2018"
 license = "AGPL-3.0"
 
+repository = "https://six-five-six-four.com/git/reactor/ptth"
+
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]

crates/ptth_quic_client_gui/Cargo.toml

@@ -5,6 +5,8 @@ authors = ["Trish"]
 edition = "2018"
 license = "AGPL-3.0"
 
+repository = "https://six-five-six-four.com/git/reactor/ptth"
+
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]

crates/ptth_relay/Cargo.toml

@@ -7,6 +7,7 @@ edition = "2018"
 license = "AGPL-3.0"
 
 description = "The PTTH relay"
+repository = "https://six-five-six-four.com/git/reactor/ptth"
 
 [dependencies]
 

crates/ptth_server/Cargo.toml

@@ -8,6 +8,7 @@ license = "AGPL-3.0"
 
 categories = ["command-line-utilities", "web-programming::http-server"]
 description = "The server for PTTH"
+repository = "https://six-five-six-four.com/git/reactor/ptth"
 documentation = "https://docs.rs/ptth_server/"
 default-run = "ptth_server"
 

crates/ptth_server/src/file_server.rs

@@ -220,6 +220,9 @@ async fn serve_file (
 	if uri.ends_with (".js") {
 		response.header ("content-type".into (), b"application/javascript".to_vec ());
 	}
+	else if uri.ends_with (".html") {
+		response.header ("content-type".into (), b"text/html; charset=UTF-8".to_vec ());
+	}
 	
 	response.header ("content-length".into (), content_length.to_string ().into_bytes ());
 	

crates/ptth_server_gui/Cargo.toml

@@ -4,6 +4,8 @@ version = "0.1.0"
 authors = ["Trish"]
 edition = "2018"
 
+repository = "https://six-five-six-four.com/git/reactor/ptth"
+
 [dependencies]
 anyhow = "1.0.38"
 fltk = "1.3.1"