Merged with the default branch.

Author: thresheek

.hgtags

@@ -71,3 +71,4 @@ fa0227b7f62691a186d752ace475868de49e9fce 1.29.1
 e7b7f2bb04e8c6f4cbe6374fd6960d4465654215 1.29.1-1
 2692a5823c403a4e209681943e32a4907317d14b 1.30.0
 8a0b4338a15648792bcad47edb53f1b1c0badeb4 1.30.0-1
+3a9046dca2a6c51ee2df2cabdf69cb9a83e7a1e6 1.31.0

.mailmap

@@ -1,2 +1,4 @@
-<a.clayton@nginx.com> <andrew@digital-domain.net>
-<a.clayton@nginx.com> <a.clayton@f5.com>
+Alejandro Colomar <alx@nginx.com> <a.colomar@f5.com>
+Alejandro Colomar <alx@nginx.com> <alx.manpages@gmail.com>
+Andrew Clayton <a.clayton@nginx.com> <andrew@digital-domain.net>
+Andrew Clayton <a.clayton@nginx.com> <a.clayton@f5.com>

CHANGES

@@ -1,4 +1,24 @@
 
+Changes with Unit 1.31.0                                         31 Aug 2023
+
+    *) Change: if building with njs, version 0.8.0 or later is now required.
+
+    *) Feature: technology preview of WebAssembly application module.
+
+    *) Feature: "response_headers" option to manage headers in the action
+       and fallback.
+
+    *) Feature: HTTP response header variables.
+
+    *) Feature: ASGI lifespan state support. Thanks to synodriver.
+
+    *) Bugfix: ensure that $uri variable is not cached.
+
+    *) Bugfix: deprecated options were unavailable.
+
+    *) Bugfix: ASGI applications inaccessible over IPv6.
+
+
 Changes with Unit 1.30.0                                         10 May 2023
 
     *) Change: remove Unix domain listen sockets upon reconfiguration.

NOTICE

@@ -1,12 +1,15 @@
 
    NGINX Unit.
 
-   Copyright 2017-2022 NGINX, Inc.
+   Copyright 2017-2023 NGINX, Inc.
+   Copyright 2017-2023 Andrei Zeliankou
+   Copyright 2018-2023 Konstantin Pavlov
+   Copyright 2021-2023 Zhidao Hong
+   Copyright 2021-2023 Alejandro Colomar
+   Copyright 2022-2023 Andrew Clayton
+   Copyright 2022-2023 Liam Crilly
    Copyright 2017-2022 Valentin V. Bartenev
    Copyright 2017-2022 Max Romanov
-   Copyright 2017-2022 Andrei Zeliankou
-   Copyright 2018-2022 Konstantin Pavlov
-   Copyright 2021-2022 Zhidao Hong
    Copyright 2021-2022 Oisín Canty
    Copyright 2017-2021 Igor Sysoev
    Copyright 2017-2021 Andrei Belov

README.md

@@ -15,12 +15,12 @@ coherent solution with a focus on performance, low latency, and scalability. It
 is intended as a universal building block for any web architecture regardless
 of its complexity, from enterprise-scale deployments to your pet's homepage.
 
-Its native RESTful JSON API enables dynamic updates with zero interruptions
-and flexible configuration, while its out-of-the-box productivity reliably
-scales to production-grade workloads. We achieve that with a complex,
-asynchronous, multithreading architecture comprising multiple processes to
-ensure security and robustness while getting the most out of today's computing
-platforms.
+Its native [RESTful JSON API](#openapi-specification) enables dynamic
+updates with zero interruptions and flexible configuration, while its
+out-of-the-box productivity reliably scales to production-grade workloads. We
+achieve that with a complex, asynchronous, multithreading architecture
+comprising multiple processes to ensure security and robustness while getting
+the most out of today's computing platforms.
 
 
 ## Quick Installation
@@ -38,7 +38,7 @@ For details and available language packages, see the
 ### Docker
 
 ``` console
-$ docker pull docker.io/nginx/unit
+$ docker pull unit
 ```
 
 For a description of image tags, see the
@@ -71,6 +71,11 @@ For details and available language packages, see the
 
 ## Running a Hello World App
 
+Unit runs apps in a
+[variety of languages](https://unit.nginx.org/howto/samples/).
+Let's consider a basic example,
+choosing PHP for no particular reason.
+
 Suppose you saved a PHP script as `/www/helloworld/index.php`:
 ``` php
 <?php echo "Hello, PHP on Unit!"; ?>
@@ -156,6 +161,16 @@ Unit's output should contain both snippets, neatly organized:
 For full details of configuration management, see the
 [docs](https://unit.nginx.org/configuration/#configuration-management).
 
+## OpenAPI Specification
+
+Our [OpenAPI specification](docs/unit-openapi.yaml) aims to simplify
+configuring and integrating NGINX Unit deployments and provide an authoritative
+source of knowledge about the control API.
+
+Although the specification is still in the early beta stage, it is a promising
+step forward for the NGINX Unit community. While working on it, we kindly ask
+you to experiment and provide feedback to help improve its functionality and
+usability.
 
 ## Community
 

auto/help

@@ -20,6 +20,7 @@ cat << END
   --modulesdir=DIR     default: "\$libdir/unit/modules"
   --datarootdir=DIR    default: "\$prefix/share"
   --mandir=DIR         default: "\$datarootdir/man"
+  --pkgconfigdir=DIR   default: "\$datarootdir/pkgconfig"
   --localstatedir=DIR  default: "\$prefix/var"
   --statedir=DIR       default: "\$localstatedir/lib/unit"
   --runstatedir=DIR    default: "\$localstatedir/run/unit"
@@ -75,4 +76,7 @@ cat << END
   java OPTIONS         configure Java module
                        run "./configure java --help" to see available options
 
+  wasm OPTIONS	       configure WebAssembly module
+		       run "./configure wasm --help" to see available options
+
 END

auto/make

@@ -94,7 +94,9 @@ $NXT_BUILD_DIR/lib/$NXT_LIB_SHARED: \$(NXT_LIB_OBJS)
 $NXT_BUILD_DIR/lib/$NXT_LIB_STATIC: \$(NXT_LIB_OBJS)
 	$NXT_STATIC_LINK \$@ \$(NXT_LIB_OBJS)
 
-$NXT_BUILD_DIR/lib/$NXT_LIB_UNIT_STATIC: \$(NXT_LIB_UNIT_OBJS)
+$NXT_BUILD_DIR/lib/$NXT_LIB_UNIT_STATIC: \$(NXT_LIB_UNIT_OBJS) \\
+		$NXT_BUILD_DIR/share/pkgconfig/unit.pc \\
+		$NXT_BUILD_DIR/share/pkgconfig/unit-uninstalled.pc
 	$NXT_STATIC_LINK \$@ \$(NXT_LIB_UNIT_OBJS)
 
 END
@@ -397,6 +399,10 @@ libunit-install: $NXT_BUILD_DIR/lib/$NXT_LIB_UNIT_STATIC
 		|| install -d \$(DESTDIR)$NXT_LIBDIR
 	install -p -m u=rw,go=r $NXT_BUILD_DIR/lib/$NXT_LIB_UNIT_STATIC \
 		\$(DESTDIR)$NXT_LIBDIR/
+	test -d \$(DESTDIR)$NXT_PKGCONFIGDIR \
+		|| install -d \$(DESTDIR)$NXT_PKGCONFIGDIR
+	install -p -m u=rw,go=r $NXT_BUILD_DIR/share/pkgconfig/unit.pc \
+		\$(DESTDIR)$NXT_PKGCONFIGDIR/
 	test -d \$(DESTDIR)$NXT_INCLUDEDIR \
 		|| install -d \$(DESTDIR)$NXT_INCLUDEDIR
 	install -p -m u=rw,go=r src/nxt_unit.h \
@@ -414,6 +420,8 @@ libunit-install: $NXT_BUILD_DIR/lib/$NXT_LIB_UNIT_STATIC
 libunit-uninstall:
 	rm -f \$(DESTDIR)$NXT_LIBDIR/$NXT_LIB_UNIT_STATIC
 	@rmdir -p \$(DESTDIR)$NXT_LIBDIR 2>/dev/null || true
+	rm -f \$(DESTDIR)$NXT_PKGCONFIGDIR/unit.pc
+	@rmdir -p \$(DESTDIR)$NXT_PKGCONFIGDIR 2>/dev/null || true
 	rm -f \$(DESTDIR)$NXT_INCLUDEDIR/nxt_unit.h \
 		\$(DESTDIR)$NXT_INCLUDEDIR/nxt_unit_field.h \
 		\$(DESTDIR)$NXT_INCLUDEDIR/nxt_unit_request.h \
@@ -428,6 +436,31 @@ libunit-uninstall:
 
 END
 
+# pkg-config files
+
+cat << END >> $NXT_MAKEFILE
+
+$NXT_BUILD_DIR/share/pkgconfig/unit.pc: src/unit.pc.in
+	sed -e "s|@PREFIX@|$NXT_PREFIX|" \\
+		-e "s|@LIBDIR@|$NXT_LIBDIR|" \\
+		-e "s|@CFLAGS@|-I$NXT_INCLUDEDIR|" \\
+		-e "s|@VERSION@|\$(NXT_VERSION)|" \\
+		-e "s|@EXTRA_LIBS@|$NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS|" \\
+		-e "s|@CONFARGS@|$(echo $NXT_CONFIGURE_OPTIONS | sed -e 's| -pie||' -e 's| --njs||')|" \\
+		-e "s|@MODULESDIR@|$NXT_MODULESDIR|" \\
+	< src/unit.pc.in > \$@
+
+$NXT_BUILD_DIR/share/pkgconfig/unit-uninstalled.pc: src/unit.pc.in
+	sed -e "s|@PREFIX@|$(pwd)/$NXT_BUILD_DIR|" \\
+		-e "s|@LIBDIR@|$(pwd)/$NXT_BUILD_DIR/lib|" \\
+		-e "s|@CFLAGS@|-I$(pwd)/src -I$(pwd)$NXT_BUILD_DIR/include|" \\
+		-e "s|@VERSION@|\$(NXT_VERSION)|" \\
+		-e "s|@EXTRA_LIBS@|$NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS|" \\
+		-e "s|@CONFARGS@|$(echo $NXT_CONFIGURE_OPTIONS | sed -e 's| -pie||' -e 's| --njs||')|" \\
+	< src/unit.pc.in > \$@
+
+END
+
 # Makefile.
 # *.dSYM is MacOSX Clang debug information.
 

auto/modules/conf

@@ -33,6 +33,10 @@ case "$nxt_module" in
        . auto/modules/java
    ;;
 
+   wasm)
+       . auto/modules/wasm
+   ;;
+
    *)
        echo
        echo $0: error: invalid module \"$nxt_module\".

auto/modules/java

@@ -238,7 +238,7 @@ cat << END > $NXT_JAVA_JARS
 static const char *nxt_java_system_jars[] = {
 END
 
-NXT_TOMCAT_VERSION=9.0.70
+NXT_TOMCAT_VERSION=9.0.75
 
 NXT_JAR_VERSION=$NXT_TOMCAT_VERSION
 
@@ -284,7 +284,7 @@ static const char *nxt_java_unit_jars[] = {
     "$NXT_UNIT_JAR",
 END
 
-NXT_JAR_VERSION=9.4.49.v20220914
+NXT_JAR_VERSION=9.4.51.v20230217
 NXT_JAR_NAMESPACE=org/eclipse/jetty/
 
 NXT_JAR_NAME=jetty-util
@@ -297,7 +297,7 @@ NXT_JAR_NAME=jetty-http
 . auto/modules/java_get_jar
 
 NXT_JAR_NAME=classgraph
-NXT_JAR_VERSION=4.8.151
+NXT_JAR_VERSION=4.8.158
 NXT_JAR_NAMESPACE=io/github/classgraph/
 . auto/modules/java_get_jar
 

auto/modules/java_jar.sha512

@@ -1,14 +1,14 @@
-4b47eabc83f3f672a7e91af6ae97bbdbc6f01ed7149540cb06b0f530f45a95d025cc7807a6640982d23d2da50bd973ad788a4c8fdfa025da7cf93c560abbe61e  classgraph-4.8.151.jar
+00dc1aedae7cb6600b4b27ac7ec0234981a23a8c6f03dc1881304b7d999d94f0fdaa51e0008288740d9890b34f41462e8ed82c76f36a18bd45eabbb8084ec8d4  classgraph-4.8.158.jar
 ab441acf5551a7dc81c353eaccb3b3df9e89a48987294d19e39acdb83a5b640fcdff7414cee29f5b96eaa8826647f1d5323e185018fe33a64c402d69c73c9158  ecj-3.26.0.jar
-82c6985f0d7c76459bf0638fdc24f3692a11804a95845b1a45203dfcc1205ab7bf67934f6babf7eb2f2b87d637a8fcbd87eae297e4403511bf73f359b1957e09  jetty-http-9.4.49.v20220914.jar
-2f199729ad9b46fda968b4bfafd657971fc9d90371852f8ad7afdae6d5752d2b84648734eabb6ffbf084800253d1da97d4bb9ad60f799ee6ae38a80c2d881fc4  jetty-server-9.4.49.v20220914.jar
-e207d93ef5bc98ad2b1a43393231bdacfb3ab642b6197a8b72d819f8ad30357c4daa0a76a0459340563fcdee0fdfc111e719a2db5be778d6b1e10f1ccbe77fc9  jetty-util-9.4.49.v20220914.jar
-a2cd93ccaa58191475df9aa40a11c8b3f14f77e78b6b2dc9e5fbebf07297e318d60c5cc5aca37e61bd748456b01491a0e6702b9e4d3ec3ef43d9b1a93f9b733e  tomcat-api-9.0.70.jar
-4b2b33f6bdcb3fbff6de7da6f7558e4a21335c5c08dbc2adba1be90ddcaa4be1ba053d9021a4891edef975759a562b46a58da6c5acc2209ae8b942e4058b7022  tomcat-el-api-9.0.70.jar
-7ee837f218220022bf2543e4b3191c0a948c7f8bbd4f2e7202cc29196e5f4a8264aee027bc3521b79775b1ab0b3f8a4bef8982be9c0b2c5f95b77f36d5e5930f  tomcat-jasper-9.0.70.jar
-f92cdddd3aae8d1b0b861afc67344fc6544c413d78e2e810f804632e68a3667b2b1929ac4995b582af03774ad024632e820143cd53273e06a796484ce2f0a73e  tomcat-jasper-el-9.0.70.jar
-5ec6985740e7a5873f56430b1f0fd6e55a625fac8f5618d846072117f5ed8ccc69665fd6ebde40381099cf42ab9525f5da3cd16dd0b50a267734bfdf7f2e168d  tomcat-jsp-api-9.0.70.jar
-33cf08f10bad572c9e7085b3ba8e91b38a293f8838a39483b01d07d9c1b9d0e67492343e0523da24af47782ec4a5d639db49679d951ccbe1da9d1309346cc693  tomcat-juli-9.0.70.jar
-0c8ee46dc49828720cd431e4e6bcb2a9d7409b3bae3d3427640b159985a27de22181151c8fa15a1f44f607730977c4ae2512c63a19c070b92e38438ad0ba8138  tomcat-servlet-api-9.0.70.jar
-e882c47acdb9e5612a0810503cb8900570b68aec5dd33dd6439884b15723a67cbf982c9cf546e7cd6d67b731df3d64ec5347500ab8a987d7cb1e11a74f819325  tomcat-util-9.0.70.jar
-0a562e8a40e406966ae2be5587dcad0ceae3143b03ef9b9f7dd77c6a2db522c31ed82b9c38b4464f9f80c1d8ca418ce6a09f9fecb3e0209a962da01e2f9bd626  tomcat-util-scan-9.0.70.jar
+606d0446a948c7a349cba5415d079bd054e43a8a09727c8300865f38678c5101642ecafa777d5f979bde1bd520543a4cf83348fcd9a444e6681cf773eb3c5824  jetty-http-9.4.51.v20230217.jar
+e9d3f7104214a16435d077eb53d943130b3a85bf9e8a48b9e40a7ad063ca3cca69324e03f21202e66fc5fd864c3cb09cd1857eff8d682c69398b4d75c1a430c6  jetty-server-9.4.51.v20230217.jar
+12725e106000d6ef672c474e467d7c976c3913b2d39a92e7304cc30d0e0d1f92575227d2c2201b97ca50f39cba81ac8b79bccb2b32b63d758ac4e192173c3f62  jetty-util-9.4.51.v20230217.jar
+b802b595d796285653c3c1b3d870295767afc6d4f857d439d579b7261dc8d015c948cd900e93ebc0ad706d1c74600645d3a18caef4f040a7085ff0e9f6cb4e44  tomcat-api-9.0.75.jar
+90cc3c2847782b6854bc0549e7bdfda2e92feac726285718aa4083baef597e472e7f3712257790107fa9306263f645fcc17344a8209415d10a75f4f4cfa30b04  tomcat-el-api-9.0.75.jar
+c23a0db30c5d77a518c7cd0afebe6c59600b45e03651409788acb91fa652752960f6e21ac15a233b433dbe290028d00ac72c4cd2856880f4d4ba9ef227692d7a  tomcat-jasper-9.0.75.jar
+06fb8c0d49945437900be1cc8fd8d8123a7bf6599e7755aa6c7963a65d46aea444661de532ce0e6c0573ecd12def2d5d1e7942ecace9c7c3a39e232373f3fd6b  tomcat-jasper-el-9.0.75.jar
+7dbaacd7f0490c8f0062eb12cd244acc9c51ee72d1c60ad841ac61905cd46b5d477b01c97019ba6e93a6b27de3e3438c620fb156cec3d6ece36f37918a6ee5bd  tomcat-jsp-api-9.0.75.jar
+05c15c5c6877b39aed4457e5ea7992819c28dc148a2442a149a8d5ee294a62042eebd2f3846acdd70b08d531d95cdcc8cfcd7b64fb8b046aa5639e7901505131  tomcat-juli-9.0.75.jar
+92a44f8970746976a63351d45f84c7963127bd21db0af834a7d38dcfb3c29450398cb4b466636dfb3d8e764093c612eb2938af22ac2098171bac201ad6bcc320  tomcat-servlet-api-9.0.75.jar
+6794c0d6d5780ca09fdbaf801c1475f227b799c809a46195c0fd1f9792303fb6d0aa6e49ac049337863bdb512c390334470210294364b7af25d86355f7fd0605  tomcat-util-9.0.75.jar
+e97c90c857a5c814518f3da10d8c09c900417421d81ad500ad338ac10c6b7dc8338b486d2338f5cebea6fa33c9803fd2c06cf35c44b1b5b720331943f2e22de3  tomcat-util-scan-9.0.75.jar