Skip to content

Commit f786810

Browse files
committed
chore: use nginx 1.26.3/OpenSSL 3.2.4 for vendored builds
1 parent 5bc247f commit f786810

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG NGX_VERSION=1.26.1
1+
ARG NGX_VERSION=1.26.3
22
ARG NGX_DEBUG=false
33

44
# --- builder: build all examples

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ NGINX modules can be built against a particular version of NGINX. The following
2020

2121
* `ZLIB_VERSION` (default 1.3.1) - zlib version
2222
* `PCRE2_VERSION` (default 10.42 for NGINX 1.22.0 and later, or 8.45 for earlier) - PCRE1 or PCRE2 version
23-
* `OPENSSL_VERSION` (default 3.2.1 for NGINX 1.22.0 and later, or 1.1.1w for earlier) - OpenSSL version
24-
* `NGX_VERSION` (default 1.26.1) - NGINX OSS version
23+
* `OPENSSL_VERSION` (default 3.2.4 for NGINX 1.22.0 and later, or 1.1.1w for earlier) - OpenSSL version
24+
* `NGX_VERSION` (default 1.26.3) - NGINX OSS version
2525
* `NGX_DEBUG` (default to false) - if set to true, then will compile NGINX `--with-debug` option
2626

2727
For example, this is how you would compile the [examples](examples) using a specific version of NGINX and enabling

nginx-sys/build/vendored.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const PCRE1_DOWNLOAD_URL_PREFIX: &str = "https://sourceforge.net/projects/pcre/f
3131
const PCRE2_DOWNLOAD_URL_PREFIX: &str = "https://github.com/PCRE2Project/pcre2/releases/download";
3232
/// The default version of openssl to use if the `OPENSSL_VERSION` environment variable is not present
3333
const OPENSSL1_DEFAULT_VERSION: &str = "1.1.1w";
34-
const OPENSSL3_DEFAULT_VERSION: &str = "3.2.1";
34+
const OPENSSL3_DEFAULT_VERSION: &str = "3.2.4";
3535
const OPENSSL_GPG_SERVER_AND_KEY_IDS: (&str, &str) = (
3636
UBUNTU_KEYSEVER,
3737
"\
@@ -42,11 +42,12 @@ B7C1C14360F353A36862E4D5231C84CDDCC69C45 \
4242
95A9908DDFA16830BE9FB9003D30A3A9FF1360DC \
4343
7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C \
4444
E5E52560DD91C556DDBDA5D02064C53641C25E5D \
45-
C1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD",
45+
C1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD \
46+
BA5473A2B0587B07FB27CF2D216094DFD0CB81EF",
4647
);
4748
const OPENSSL_DOWNLOAD_URL_PREFIX: &str = "https://github.com/openssl/openssl/releases/download";
4849
/// The default version of NGINX to use if the `NGX_VERSION` environment variable is not present
49-
const NGX_DEFAULT_VERSION: &str = "1.26.1";
50+
const NGX_DEFAULT_VERSION: &str = "1.26.3";
5051

5152
/// Key 1: Konstantin Pavlov's public key. For Nginx 1.25.3 and earlier
5253
/// Key 2: Sergey Kandaurov's public key. For Nginx 1.25.4

src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
//!
1010
//! * `ZLIB_VERSION` (default 1.3.1) - zlib version
1111
//! * `PCRE2_VERSION` (default 10.42 for NGINX 1.22.0 and later, or 8.45 for earlier) - PCRE1 or PCRE2 version
12-
//! * `OPENSSL_VERSION` (default 3.2.1 for NGINX 1.22.0 and later, or 1.1.1w for earlier) - OpenSSL version
13-
//! * `NGX_VERSION` (default 1.26.1) - NGINX OSS version
12+
//! * `OPENSSL_VERSION` (default 3.2.4 for NGINX 1.22.0 and later, or 1.1.1w for earlier) - OpenSSL version
13+
//! * `NGX_VERSION` (default 1.26.3) - NGINX OSS version
1414
//! * `NGX_DEBUG` (default to false) - if set to true, then will compile NGINX `--with-debug` option
1515
//!
1616
//! 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

0 commit comments

Comments
 (0)