diff --git a/README.md b/README.md index a1eaf83..9f9d879 100644 --- a/README.md +++ b/README.md @@ -244,7 +244,7 @@ To build this module, simply do the following: make && make install ``` -This will download the NGINX source code if it is not already local. If it is, the location may be provided when prompted. By default, version 1.19.0 will be downloaded; a different version can be fetched by setting `NGINX_VERSION` before running the `configure` script. Any [additional parameters](http://nginx.org/en/docs/configure.html) (e.g., `--prefix`) that NGINX's `configure` script supports can also be provided. When this module's `configure` script is run, it will pass along `--with-compat` to NGINX's script. It asks if a dynamic module should be created (thus passing along `--add-dynamic-module`) or if the module should be compiled into the NGINX binary (thus passing `--add-module`); by default, it created a dynamically-linked module. It will also ask if debug flags should be enabled; if so, `--with-debug` and certain GCC flags will be passed on to NGINX's `configure` script to make debugging easier. After the script is run, just execute `make && make install`. These too will delegate to NGINX's `Makefile`. After this, the module will be usable and can be configured as described above. +This will download the NGINX source code if it is not already local. If it is, the location may be provided when prompted. By default, version 1.21.3 will be downloaded; a different version can be fetched by setting `NGINX_VERSION` before running the `configure` script. Any [additional parameters](http://nginx.org/en/docs/configure.html) (e.g., `--prefix`) that NGINX's `configure` script supports can also be provided. When this module's `configure` script is run, it will pass along `--with-compat` to NGINX's script. It asks if a dynamic module should be created (thus passing along `--add-dynamic-module`) or if the module should be compiled into the NGINX binary (thus passing `--add-module`); by default, it created a dynamically-linked module. It will also ask if debug flags should be enabled; if so, `--with-debug` and certain GCC flags will be passed on to NGINX's `configure` script to make debugging easier. After the script is run, just execute `make && make install`. These too will delegate to NGINX's `Makefile`. After this, the module will be usable and can be configured as described above. > *WARNING* If `--without-pcre`, `--without-http_gzip_module` and potentially other flags are provided to the `configure` script and a module is created, it will _not_ be compatible with NGINX Plus or the pre-compiled open source NGINX binaries; if you include such flags (when building the module), you will only be able to load it into a custom build of NGINX that also excludes the same functionality. If the `configure` script exits with an error about a missing dependency, like [PCRE](https://www.pcre.org/) and [zlib](http://zlib.net/), install those instead of excluding them if compatibility with pre-build NGINX binaries is desired.

@@ -287,17 +287,17 @@ This module is compatible with Curity version >= 2.2. It has been tested with NG Pre-built binaries of this module are provided for the following versions of NGINX on the corresponding operating system distributions: -| | NGINX 1.17.9 / NGINX Plus R21 | NGINX 1.19.0 / NGINX Plus R22 | NGINX 1.19.5 / NGINX Plus R23 | +| | NGINX 1.19.5 / NGINX Plus R23 | NGINX 1.19.10 / NGINX Plus R24 | NGINX 1.21.3 / NGINX Plus R25 | | ----------------------------------|:-----------------------------:|:---------------------------------:|:---------------------------------:| -| Amazon Linux | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.1.1/amzn.ngx_curity_http_phantom_token_module_1.17.9.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.1.1/amzn.ngx_curity_http_phantom_token_module_1.19.0.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.1.1/amzn.ngx_curity_http_phantom_token_module_1.19.5.so) | -| Amazon Linux 2 | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.1.1/amzn2.ngx_curity_http_phantom_token_module_1.17.9.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.1.1/amzn2.ngx_curity_http_phantom_token_module_1.19.0.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.1.1/amzn2.ngx_curity_http_phantom_token_module_1.19.5.so) | -| CentOS 7.0+ | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.1.1/centos.7.ngx_curity_http_phantom_token_module_1.17.9.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.1.1/centos.7.ngx_curity_http_phantom_token_module_1.19.0.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.1.1/centos.7.ngx_curity_http_phantom_token_module_1.19.5.so) | -| CentOS 8.0+ | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.1.1/centos.8.ngx_curity_http_phantom_token_module_1.17.9.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.1.1/centos.8.ngx_curity_http_phantom_token_module_1.19.0.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.1.1/centos.8.ngx_curity_http_phantom_token_module_1.19.5.so) | -| Debian 9.0 (Stretch) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.1.1/debian.stretch.ngx_curity_http_phantom_token_module_1.17.9.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.1.1/debian.stretch.ngx_curity_http_phantom_token_module_1.19.0.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.1.1/debian.stretch.ngx_curity_http_phantom_token_module_1.19.5.so) | -| Debian 10.0 (Buster) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.1.1/debian.buster.ngx_curity_http_phantom_token_module_1.17.9.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.1.1/debian.buster.ngx_curity_http_phantom_token_module_1.19.0.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.1.1/debian.buster.ngx_curity_http_phantom_token_module_1.19.5.so) | -| Alpine | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.1.1/alpine.ngx_curity_http_phantom_token_module_1.17.9.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.1.1/alpine.ngx_curity_http_phantom_token_module_1.19.0.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.1.1/alpine.ngx_curity_http_phantom_token_module_1.19.5.so) | -| Ubuntu 18.04 LTS (Bionic Beaver) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.1.1/ubuntu.18.04.ngx_curity_http_phantom_token_module_1.17.9.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.1.1/ubuntu.18.04.ngx_curity_http_phantom_token_module_1.19.0.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.1.1/ubuntu.18.04.ngx_curity_http_phantom_token_module_1.19.5.so) | -| Ubuntu 20.04 LTS (Focal Fossa) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.1.1/ubuntu.20.04.ngx_curity_http_phantom_token_module_1.17.9.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.1.1/ubuntu.20.04.ngx_curity_http_phantom_token_module_1.19.0.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.1.1/ubuntu.20.04.ngx_curity_http_phantom_token_module_1.19.5.so) | +| Amazon Linux | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.2.0/amzn.ngx_curity_http_phantom_token_module_1.19.5.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.2.0/amzn.ngx_curity_http_phantom_token_module_1.19.10.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.2.0/amzn.ngx_curity_http_phantom_token_module_1.21.3.so) | +| Amazon Linux 2 | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.2.0/amzn2.ngx_curity_http_phantom_token_module_1.19.5.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.2.0/amzn2.ngx_curity_http_phantom_token_module_1.19.10.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.2.0/amzn2.ngx_curity_http_phantom_token_module_1.21.3.so) | +| CentOS 7.0+ | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.2.0/centos.7.ngx_curity_http_phantom_token_module_1.19.5.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.2.0/centos.7.ngx_curity_http_phantom_token_module_1.19.10.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.2.0/centos.7.ngx_curity_http_phantom_token_module_1.21.3.so) | +| CentOS 8.0+ | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.2.0/centos.8.ngx_curity_http_phantom_token_module_1.19.5.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.2.0/centos.8.ngx_curity_http_phantom_token_module_1.19.10.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.2.0/centos.8.ngx_curity_http_phantom_token_module_1.21.3.so) | +| Debian 9.0 (Stretch) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.2.0/debian.stretch.ngx_curity_http_phantom_token_module_1.19.5.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.2.0/debian.stretch.ngx_curity_http_phantom_token_module_1.19.10.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.2.0/debian.stretch.ngx_curity_http_phantom_token_module_1.21.3.so) | +| Debian 10.0 (Buster) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.2.0/debian.buster.ngx_curity_http_phantom_token_module_1.19.5.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.2.0/debian.buster.ngx_curity_http_phantom_token_module_1.19.10.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.2.0/debian.buster.ngx_curity_http_phantom_token_module_1.21.3.so) | +| Alpine | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.2.0/alpine.ngx_curity_http_phantom_token_module_1.19.5.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.2.0/alpine.ngx_curity_http_phantom_token_module_1.19.10.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.2.0/alpine.ngx_curity_http_phantom_token_module_1.21.3.so) | +| Ubuntu 18.04 LTS (Bionic Beaver) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.2.0/ubuntu.18.04.ngx_curity_http_phantom_token_module_1.19.5.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.2.0/ubuntu.18.04.ngx_curity_http_phantom_token_module_1.19.10.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.2.0/ubuntu.18.04.ngx_curity_http_phantom_token_module_1.21.3.so) | +| Ubuntu 20.04 LTS (Focal Fossa) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.2.0/ubuntu.20.04.ngx_curity_http_phantom_token_module_1.19.5.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.2.0/ubuntu.20.04.ngx_curity_http_phantom_token_module_1.19.10.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.2.0/ubuntu.20.04.ngx_curity_http_phantom_token_module_1.21.3.so) | ## Testing diff --git a/build.sh b/build.sh index 55254e4..c328ffb 100755 --- a/build.sh +++ b/build.sh @@ -1,6 +1,6 @@ #!/bin/bash -NGINX_VERSION=${NGINX_VERSION:-1.19.0} +NGINX_VERSION=${NGINX_VERSION:-1.21.3} NGINX_TARBALL=nginx-${NGINX_VERSION}.tar.gz if [[ ! -r $NGINX_TARBALL ]]; then diff --git a/configure b/configure index f9a345e..85d7a94 100755 --- a/configure +++ b/configure @@ -4,7 +4,7 @@ set -e SRC_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) -NGINX_VERSION=${NGINX_VERSION:-1.19.0} +NGINX_VERSION=${NGINX_VERSION:-1.21.3} BUILD_INFO_FILE="$SRC_DIR/.build.info" test -f "$BUILD_INFO_FILE" && . "$BUILD_INFO_FILE"