chore: update dependencies

Dockerfile

@@ -1,4 +1,4 @@
-ARG NGX_VERSION=1.26.1
+ARG NGX_VERSION=1.26.3
 ARG NGX_DEBUG=false
 
 # --- builder: build all examples

README.md

@@ -20,8 +20,8 @@ NGINX modules can be built against a particular version of NGINX. The following
 
 * `ZLIB_VERSION` (default 1.3.1) - zlib version
 * `PCRE2_VERSION` (default 10.42 for NGINX 1.22.0 and later, or 8.45 for earlier) - PCRE1 or PCRE2 version
-* `OPENSSL_VERSION` (default 3.2.1 for NGINX 1.22.0 and later, or 1.1.1w for earlier) - OpenSSL version
-* `NGX_VERSION` (default 1.26.1) - NGINX OSS version
+* `OPENSSL_VERSION` (default 3.2.4 for NGINX 1.22.0 and later, or 1.1.1w for earlier) - OpenSSL version
+* `NGX_VERSION` (default 1.26.3) - NGINX OSS version
 * `NGX_DEBUG` (default to false) -  if set to true, then will compile NGINX `--with-debug` option
 
 For example, this is how you would compile the [examples](examples) using a specific version of NGINX and enabling

deny.toml

@@ -11,7 +11,6 @@ allow = [
     "BSD-3-Clause",
     "ISC",
     "MIT",
-    "OpenSSL",
     "Unicode-3.0",
 ]
 confidence-threshold = 0.8

examples/Cargo.toml

@@ -20,6 +20,8 @@ ngx = { path = "../", default-features = false, features = ["std"] }
 aws-sign-v4 = "0.3.0"
 chrono = "0.4.23"
 http = "1.1.0"
+# use unicode-rs idna backend for lower MSRV and faster builds
+idna_adapter = "=1.1.0"
 libc = "0.2.140"
 tokio = { version = "1.33.0", features = ["full"] }
 

nginx-sys/Cargo.toml

@@ -22,17 +22,10 @@ cc = "1.2.0"
 duct = { version = "0.13.7", optional = true }
 dunce = "1.0.5"
 flate2 = { version = "1.0.28", optional = true }
-# Disable non-ASCII domain names support in ureq. We don't need it for any
-# of the 4 domains the buildscript interacts with.
-# See https://github.com/servo/rust-url/issues/993
-idna_adapter = { version = "~1.0", optional = true }
 regex = "1.11.1"
 tar =  { version = "0.4.40", optional = true }
-ureq = { version = "2.9.6", features = ["tls"], optional = true }
+ureq = { version = "3.0.10", optional = true }
 which = { version = "7.0.0", optional = true }
 
 [features]
-vendored = [
-    "dep:which", "dep:duct", "dep:idna_adapter", "dep:ureq", "dep:flate2",
-    "dep:tar"
-]
+vendored = ["dep:which", "dep:duct", "dep:ureq", "dep:flate2", "dep:tar"]

nginx-sys/build/vendored.rs

@@ -31,7 +31,7 @@ const PCRE1_DOWNLOAD_URL_PREFIX: &str = "https://sourceforge.net/projects/pcre/f
 const PCRE2_DOWNLOAD_URL_PREFIX: &str = "https://github.com/PCRE2Project/pcre2/releases/download";
 /// The default version of openssl to use if the `OPENSSL_VERSION` environment variable is not present
 const OPENSSL1_DEFAULT_VERSION: &str = "1.1.1w";
-const OPENSSL3_DEFAULT_VERSION: &str = "3.2.1";
+const OPENSSL3_DEFAULT_VERSION: &str = "3.2.4";
 const OPENSSL_GPG_SERVER_AND_KEY_IDS: (&str, &str) = (
     UBUNTU_KEYSEVER,
     "\
@@ -42,11 +42,12 @@ B7C1C14360F353A36862E4D5231C84CDDCC69C45 \
 95A9908DDFA16830BE9FB9003D30A3A9FF1360DC \
 7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C \
 E5E52560DD91C556DDBDA5D02064C53641C25E5D \
-C1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD",
+C1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD \
+BA5473A2B0587B07FB27CF2D216094DFD0CB81EF",
 );
 const OPENSSL_DOWNLOAD_URL_PREFIX: &str = "https://github.com/openssl/openssl/releases/download";
 /// The default version of NGINX to use if the `NGX_VERSION` environment variable is not present
-const NGX_DEFAULT_VERSION: &str = "1.26.1";
+const NGX_DEFAULT_VERSION: &str = "1.26.3";
 
 /// Key 1: Konstantin Pavlov's public key. For Nginx 1.25.3 and earlier
 /// Key 2: Sergey Kandaurov's public key. For Nginx 1.25.4
@@ -367,7 +368,8 @@ fn download(cache_dir: &Path, url: &str) -> Result<PathBuf, Box<dyn StdError>> {
     let file_path = cache_dir.join(filename);
     if proceed_with_download(&file_path) {
         println!("Downloading: {} -> {}", url, file_path.display());
-        let mut reader = ureq::get(url).call()?.into_reader();
+        let mut response = ureq::get(url).call()?;
+        let mut reader = response.body_mut().as_reader();
         let mut file = File::create(&file_path)?;
         std::io::copy(&mut reader, &mut file)?;
     }

src/lib.rs

@@ -9,8 +9,8 @@
 //!
 //! * `ZLIB_VERSION` (default 1.3.1) - zlib version
 //! * `PCRE2_VERSION` (default 10.42 for NGINX 1.22.0 and later, or 8.45 for earlier) - PCRE1 or PCRE2 version
-//! * `OPENSSL_VERSION` (default 3.2.1 for NGINX 1.22.0 and later, or 1.1.1w for earlier) - OpenSSL version
-//! * `NGX_VERSION` (default 1.26.1) - NGINX OSS version
+//! * `OPENSSL_VERSION` (default 3.2.4 for NGINX 1.22.0 and later, or 1.1.1w for earlier) - OpenSSL version
+//! * `NGX_VERSION` (default 1.26.3) - NGINX OSS version
 //! * `NGX_DEBUG` (default to false) -  if set to true, then will compile NGINX `--with-debug` option
 //!
 //! For example, this is how you would compile the [examples](https://github.com/nginx/ngx-rust/tree/master/examples) using a specific version of NGINX and enabling