Skip to content

Commit fa2e36f

Browse files
committed
chore: use nginx 1.28.0/OpenSSL 3.5.0/pcre2 10.45 for vendored builds
1 parent e10b5d3 commit fa2e36f

File tree

4 files changed

+18
-13
lines changed

4 files changed

+18
-13
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG NGX_VERSION=1.26.3
1+
ARG NGX_VERSION=1.28.0
22
ARG NGX_DEBUG=false
33

44
# --- builder: build all examples

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ In short, this SDK allows writing NGINX modules using the Rust language.
1919
NGINX modules can be built against a particular version of NGINX. The following environment variables can be used to specify a particular version of NGINX or an NGINX dependency:
2020

2121
* `ZLIB_VERSION` (default 1.3.1) - zlib version
22-
* `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.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
22+
* `PCRE2_VERSION` (default 10.45 for NGINX 1.22.0 and later, or 8.45 for earlier) - PCRE1 or PCRE2 version
23+
* `OPENSSL_VERSION` (default 3.5.0 for NGINX 1.22.0 and later, or 1.1.1w for earlier) - OpenSSL version
24+
* `NGX_VERSION` (default 1.28.0) - 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

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,21 @@ const ZLIB_GPG_SERVER_AND_KEY_ID: (&str, &str) =
2525
const ZLIB_DOWNLOAD_URL_PREFIX: &str = "https://github.com/madler/zlib/releases/download";
2626
/// The default version of pcre to use if the `PCRE2_VERSION` environment variable is not present
2727
const PCRE1_DEFAULT_VERSION: &str = "8.45";
28-
const PCRE2_DEFAULT_VERSION: &str = "10.42";
29-
/// Key 1: Phillip Hazel's public key. For PCRE2 10.42 and earlier
30-
const PCRE2_GPG_SERVER_AND_KEY_ID: (&str, &str) =
31-
(UBUNTU_KEYSEVER, "45F68D54BBE23FB3039B46E59766E084FB0F43D8");
28+
const PCRE2_DEFAULT_VERSION: &str = "10.45";
29+
/// Key 1: Phillip Hazel's public key. For PCRE2 10.44 and earlier
30+
/// Key 2: Nicholas Wilson's public key. For PCRE2 10.45
31+
const PCRE2_GPG_SERVER_AND_KEY_ID: (&str, &str) = (
32+
UBUNTU_KEYSEVER,
33+
"\
34+
45F68D54BBE23FB3039B46E59766E084FB0F43D8 \
35+
A95536204A3BB489715231282A98E77EB6F24CA8",
36+
);
3237
const PCRE1_DOWNLOAD_URL_PREFIX: &str = "https://sourceforge.net/projects/pcre/files/pcre";
3338
const PCRE2_DOWNLOAD_URL_PREFIX: &str = "https://github.com/PCRE2Project/pcre2/releases/download";
3439
/// The default version of openssl to use if the `OPENSSL_VERSION` environment variable is not
3540
/// present
3641
const OPENSSL1_DEFAULT_VERSION: &str = "1.1.1w";
37-
const OPENSSL3_DEFAULT_VERSION: &str = "3.2.4";
42+
const OPENSSL3_DEFAULT_VERSION: &str = "3.5.0";
3843
const OPENSSL_GPG_SERVER_AND_KEY_IDS: (&str, &str) = (
3944
UBUNTU_KEYSEVER,
4045
"\
@@ -50,7 +55,7 @@ BA5473A2B0587B07FB27CF2D216094DFD0CB81EF",
5055
);
5156
const OPENSSL_DOWNLOAD_URL_PREFIX: &str = "https://github.com/openssl/openssl/releases/download";
5257
/// The default version of NGINX to use if the `NGX_VERSION` environment variable is not present
53-
const NGX_DEFAULT_VERSION: &str = "1.26.3";
58+
const NGX_DEFAULT_VERSION: &str = "1.28.0";
5459

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

src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
//! to specify a particular version of NGINX or an NGINX dependency:
99
//!
1010
//! * `ZLIB_VERSION` (default 1.3.1) - zlib version
11-
//! * `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.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
11+
//! * `PCRE2_VERSION` (default 10.45 for NGINX 1.22.0 and later, or 8.45 for earlier) - PCRE1 or PCRE2 version
12+
//! * `OPENSSL_VERSION` (default 3.5.0 for NGINX 1.22.0 and later, or 1.1.1w for earlier) - OpenSSL version
13+
//! * `NGX_VERSION` (default 1.28.0) - 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)