diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d8e3421..0cd3323c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ Pushpin Changelog ================= +v. 1.40.1 (2024-08-13) + + * Fix build with recent rustc. + v. 1.40.0 (2024-07-17) * Restore support for receiving chunked responses from backends. diff --git a/Cargo.lock b/Cargo.lock index 9140b093..68da2ed8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -429,6 +429,15 @@ dependencies = [ "typenum", ] +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + [[package]] name = "digest" version = "0.10.7" @@ -777,6 +786,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-integer" version = "0.1.45" @@ -819,9 +834,9 @@ checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" [[package]] name = "openssl" -version = "0.10.60" +version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79a4c6c3a2b158f7f8f2a2fc5a969fa3a068df6fc9dbb4a43845436e3af7c800" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ "bitflags 2.4.1", "cfg-if", @@ -851,9 +866,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.99" +version = "0.9.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ "cc", "libc", @@ -983,6 +998,12 @@ dependencies = [ "plotters-backend", ] +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "proc-macro2" version = "1.0.69" @@ -994,7 +1015,7 @@ dependencies = [ [[package]] name = "pushpin" -version = "1.40.0-dev" +version = "1.40.1-dev" dependencies = [ "arrayvec", "base64 0.13.1", @@ -1492,13 +1513,16 @@ dependencies = [ [[package]] name = "time" -version = "0.3.18" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af0097eaf301d576d0b2aead7a59facab6d53cc636340f0291fab8446a2e8613" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ + "deranged", "itoa", "libc", + "num-conv", "num_threads", + "powerfmt", "serde", "time-core", "time-macros", @@ -1506,16 +1530,17 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.6" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] diff --git a/Cargo.toml b/Cargo.toml index baadf632..4214f1fc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pushpin" -version = "1.40.0-dev" +version = "1.40.1-dev" authors = ["Justin Karneges "] description = "Reverse proxy for realtime web services" repository = "https://github.com/fastly/pushpin" @@ -30,7 +30,7 @@ libc = "0.2" log = "0.4" miniz_oxide = "0.6" mio = { version = "1", features = ["os-poll", "os-ext", "net"] } -openssl = "0.10" +openssl = "=0.10.66" paste = "1.0" rustls = "0.21" rustls-native-certs = "0.6" @@ -41,7 +41,7 @@ signal-hook = "0.3" slab = "0.4" socket2 = "0.4" thiserror = "1.0" -time = { version = "=0.3.18", features = ["formatting", "local-offset", "macros"] } +time = { version = "0.3.36", features = ["formatting", "local-offset", "macros"] } url = "2.3" zmq = "0.9" @@ -52,7 +52,7 @@ test-log = "0.2" [build-dependencies] pkg-config = "0.3" -time = { version = "=0.3.18", features = ["formatting", "local-offset", "macros"] } +time = { version = "0.3.36", features = ["formatting", "local-offset", "macros"] } cbindgen = "0.26" [[bench]]