8 files changed, 152 insertions, 23 deletions
diff --git a/auto/cc/deps b/auto/cc/deps
index 6e7df20f..11429788 100644
--- a/auto/cc/deps
+++ b/auto/cc/deps
@@ -3,7 +3,7 @@ case "$NXT_CC_NAME" in
 
     SunC):
         nxt_gen_dep_flags() {
-            $echo "-xMMD -xMF $NXT_BUILD_DIR/$nxt_dep.tmp" 
+            $echo "-xMMD -xMF $NXT_BUILD_DIR/$nxt_dep.tmp"
         }
 
         nxt_gen_dep_post() {
@@ -15,7 +15,7 @@ case "$NXT_CC_NAME" in
 
     *)
         nxt_gen_dep_flags() {
-            $echo "-MMD -MF $NXT_BUILD_DIR/$nxt_dep -MT $NXT_BUILD_DIR/$nxt_obj" 
+            $echo "-MMD -MF $NXT_BUILD_DIR/$nxt_dep -MT $NXT_BUILD_DIR/$nxt_obj"
         }
 
         nxt_gen_dep_post() {
diff --git a/auto/endian b/auto/endian
index cb23639b..40b5ad28 100644
--- a/auto/endian
+++ b/auto/endian
@@ -1,6 +1,6 @@
 # Copyright (C) Igor Sysoev
 # Copyright (C) Andrew Clayton
-# Copyright (C) Nginx, Inc.
+# Copyright (C) NGINX, Inc.
 
 
 nxt_feature="endianness"
diff --git a/auto/help b/auto/help
index b6d9919f..d23c67ed 100644
--- a/auto/help
+++ b/auto/help
@@ -76,7 +76,12 @@ 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
+  wasm OPTIONS         configure WebAssembly module
+                       run "./configure wasm --help" to see available options
+
+  wasm-wasi-component OPTIONS
+                       configure WebAssembly Component Model module
+                       run "./configure wasm-wasi-component --help" to see
+                       available options
 
 END
diff --git a/auto/modules/conf b/auto/modules/conf
index 31be751f..ab4ed351 100644
--- a/auto/modules/conf
+++ b/auto/modules/conf
@@ -37,6 +37,10 @@ case "$nxt_module" in
        . auto/modules/wasm
    ;;
 
+   wasm-wasi-component)
+       . auto/modules/wasm-wasi-component
+   ;;
+
    *)
        echo
        echo $0: error: invalid module \"$nxt_module\".
diff --git a/auto/modules/java b/auto/modules/java
index 53f99f7e..b5c8d70a 100644
--- a/auto/modules/java
+++ b/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.82
+NXT_TOMCAT_VERSION=9.0.86
 
 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.53.v20231009
+NXT_JAR_VERSION=9.4.54.v20240208
 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.162
+NXT_JAR_VERSION=4.8.165
 NXT_JAR_NAMESPACE=io/github/classgraph/
 . auto/modules/java_get_jar
 
diff --git a/auto/modules/java_jar.sha512 b/auto/modules/java_jar.sha512
index e0a648af..a689b901 100644
--- a/auto/modules/java_jar.sha512
+++ b/auto/modules/java_jar.sha512
@@ -1,14 +1,14 @@
-a117092f4ab77ef89b3b83a45b9e33c0360cb18098df17da77e5d765a6b5cea1fae6190399217236c0d970f2b3603bc8f408c2471cf8854de1282dba7525c335  classgraph-4.8.162.jar
+d0c17607eee55e181baa03f1abb2cf77f50e5114c471c2031607206768d8549c74ebb0a276d87dd3f8ea44db5e54e56087311c229ba18ad6013c388fc861beed  classgraph-4.8.165.jar
 ab441acf5551a7dc81c353eaccb3b3df9e89a48987294d19e39acdb83a5b640fcdff7414cee29f5b96eaa8826647f1d5323e185018fe33a64c402d69c73c9158  ecj-3.26.0.jar
-867afb0e69ab225a3d57c0eda4e773ca2f41dcc6eb294e14aef4d69441314bee88221081f9edc6289b9e4a99184804b60c32f4443c8ff96eb34d6508b348b755  jetty-http-9.4.53.v20231009.jar
-aca14debabc0cc40e154d4de4de404c383c4611e9f2482911e17d9072f0941cef8a88511d5d49d70946e65872e1bc8d395b9401b2ec91132553d782d99140ce3  jetty-server-9.4.53.v20231009.jar
-429b269e21c6e7bf86ba8a8b71569e3abf61b06ace9dd064a9c80af4282227e910a8d20be86ef6581895ff283a5aa4711bbb238de45dc7628f494624879c4d49  jetty-util-9.4.53.v20231009.jar
-ee33bc0020ce5be2fbdb52352fb9b2846dc5898b2190e46b2a8efdfdb16a33a83538731a6d7eeeb91c7b81e8d1e022b15924fa30ee1e9770a9f9adf96989ffd7  tomcat-api-9.0.82.jar
-dfb4a37dddf4bc4e9a41a1381544c81e3962a63833f024236d1ed28eabe8daae77cd79466881177ce9f729efad2f5169e9cf8a9e45c820b775c3a9223d258e6f  tomcat-el-api-9.0.82.jar
-db764d29d882458d8cc2aeded7b25b6129eeeb7d9ec5b77d380ca14add659a8c12f233802a5e8dfa287a1c1b9dbfd6a12fa053ec506443bde0dce9fb36081782  tomcat-jasper-9.0.82.jar
-bcc9ffc0f4d50defb0fdb12c2f9a8bd89fd8758f768c2495baa9c0e77a0ae08f3e610f6893ecd30843cfda6021120d9886aab3e377309ded68cd83f3d32b654a  tomcat-jasper-el-9.0.82.jar
-d2d9154b622b18ef190146631984188d6353ad2cb3c6ec1922387c76ae4d279a511d76680271f29b861ee18b444894ed66e5e41030e0beb265bf47eecc1a3a81  tomcat-jsp-api-9.0.82.jar
-e1c92251e2e1cd5fc99d304399fbb13af50b7d86e56ffca59edb85934474df2b8dd6b4ea3d949cc1d7cc21e673094a044b22d05bc45e540c9a0a211974ebee5c  tomcat-juli-9.0.82.jar
-7d30076e306403c243ed4d802fca6de7e827e7f6cef8827353fff4514bee484ff71abc61597fd92b63470c6477bb26c398d4cd9b293f059e0ff94156f0210106  tomcat-servlet-api-9.0.82.jar
-b06b112011526911b08849093d61a4d4337283f4a54dee2d4f8f4ce55687eabdf5df97b9326e1430fe7cd4d043a16076e86c1354cc2661c19e87918c4635e3d1  tomcat-util-9.0.82.jar
-dfe0beac3b4b8466454fb790e9dd7a17b97e62edb0f5caaaedab0360b32a0536b7d788f3d5511eb47ea3abca4f5751ab32c814c73dbf465529898d78b69fb8d6  tomcat-util-scan-9.0.82.jar
+6e1d6fdffcb2acf8daa9ce5b3ad973526a30b3556dc8e950254c68c64cd70e101b28a8acac41b3bd74de6b9c8eac10676afdc3c58ccb1f61a74323721592e0b5  jetty-http-9.4.54.v20240208.jar
+780ee47a8722bdfb4b159f440acbfb69afdb73cc329906392b10eba8d30c564aa6377fab129e61b85a56945f01c4403913c80b6ce3158d108d88a3ad64527f06  jetty-server-9.4.54.v20240208.jar
+fbe9cf7efeba9f29297f75de3f1c2d98f0e02816a1dc9e6eaddcabb84c3a699a9332218c532017a3707ec57f4f99066bc671708bde4ec84dd873b8403422d7e9  jetty-util-9.4.54.v20240208.jar
+1aa9024f49f74b44252f7c90d00bbfdd6aae4e96866708a0c2325def0314c8b7e5ad2fd17bb6b4b135eb2c513fe74b5b591d4b0fe3d1921192cfecadf140b7fa  tomcat-api-9.0.86.jar
+60a9991ff7b95ef4edfac57cd7c18b6c5177d9aee4f775b5794b5833246b928e1a685b80785babd2f450e3cd18383c58b843b0b5e742252a37044494bc90d608  tomcat-el-api-9.0.86.jar
+b09cbfb834564cc7025ffad7bf069569989d3efa3bd176696045aea08bfb53622aa1aece5c84ea4371f0193d4fd477b9179999399e75d04205b219a3ab19bb66  tomcat-jasper-9.0.86.jar
+1431469e91debc0ffcf820df2973782221be955dac0739a77d9030ac619cde96320970cb27eb2ff9de1e6bde3227a70b1645d1934da8e10fe2b32c069d33afec  tomcat-jasper-el-9.0.86.jar
+1ad9ebc1c49beb243c18ab2c459dbd54cab9514223c44b5c7e05d53d290c64c49990fc0fe276c66b1f6f6625acca651fdcb4b7df9e23fb0cc43bc05ad3900798  tomcat-jsp-api-9.0.86.jar
+d30055aabf5d45ad350e01702ed0ff4bfbcdd14bee40e1e8a9a7690719816aff019ca961b7970234eaba673c3c13f5cea5dbf1bc0612ce4e8f7de795af2f170d  tomcat-juli-9.0.86.jar
+d7fa7d7bf35b35b7bb925cce6284e2f750e8e94ee54057daff4e369a32b361e6044e9011048a9dff54b12371ee785d34e82306b60ffae8add76602071e5fc9c5  tomcat-servlet-api-9.0.86.jar
+b4a268b79fbfcd610ea5d14446ef71ad5f2ad3da247ae148669e3082ff5fd7f7256a2ecdf2529e4280ed393f53c3a7f6d09a5c38d5653b30b25ab3c4b74ed732  tomcat-util-9.0.86.jar
+f2086356c8eca5cfe890232056ce30378422d3994c499845f52ec8641453af02041ae31ffdcb567bb998f0f24465d1ab65456b23e8f781058efdc01658c7252d  tomcat-util-scan-9.0.86.jar
diff --git a/auto/modules/nodejs b/auto/modules/nodejs
index 968f3fdf..472fb3be 100644
--- a/auto/modules/nodejs
+++ b/auto/modules/nodejs
@@ -123,8 +123,8 @@ fi
 
 NXT_NODE_TMP=${NXT_BUILD_DIR}/src/${NXT_NODE}/unit-http
 NXT_NODE_TMP_G=${NXT_BUILD_DIR}/src/${NXT_NODE}/unit-http-g
-NXT_NODE_TARBALL=${NXT_BUILD_DIR}/${NXT_NODE}-unit-http.tar.gz
-NXT_NODE_TARBALL_G=${NXT_BUILD_DIR}/${NXT_NODE}-unit-http-g.tar.gz
+NXT_NODE_TARBALL=${NXT_BUILD_DIR}/src/${NXT_NODE}-unit-http.tar.gz
+NXT_NODE_TARBALL_G=${NXT_BUILD_DIR}/src/${NXT_NODE}-unit-http-g.tar.gz
 NXT_NODE_VERSION_FILE=${NXT_BUILD_DIR}/src/${NXT_NODE}/version.h
 NXT_NODE_PACKAGE_FILE=${NXT_BUILD_DIR}/src/${NXT_NODE}/package.json
 NXT_NODE_EXPORTS="export UNIT_SRC_PATH=${PWD}/src \
diff --git a/auto/modules/wasm-wasi-component b/auto/modules/wasm-wasi-component
new file mode 100644
index 00000000..bfb6ffcb
--- /dev/null
+++ b/auto/modules/wasm-wasi-component
@@ -0,0 +1,120 @@
+# Copyright (C) Andrew Clayton
+# Copyright (C) F5, Inc.
+
+
+NXT_WCM_MODULE=wasm-wasi-component
+NXT_WCM_MOD_NAME=`echo $NXT_WCM_MODULE | tr '-' '_'`.unit.so
+
+NXT_WCM_MOD_CARGO="src/wasm-wasi-component/target/release/libwasm_wasi_component.so"
+
+
+shift
+
+for nxt_option; do
+
+    case "$nxt_option" in
+        -*=*) value=`echo "$nxt_option" | sed -e 's/[-_a-zA-Z0-9]*=//'`     ;;
+           *) value="" ;;
+    esac
+
+    case "$nxt_option" in
+
+        --help)
+            cat << END
+
+END
+            exit 0
+        ;;
+
+        *)
+            echo
+            echo $0: error: invalid $NXT_WCM_MODULE option \"$nxt_option\"
+            echo
+            exit 1
+        ;;
+    esac
+
+done
+
+
+if [ ! -f $NXT_AUTOCONF_DATA ]; then
+   echo
+   echo Please run common $0 before configuring module \"$nxt_module\".
+   echo
+   exit 1
+fi
+
+. $NXT_AUTOCONF_DATA
+
+NXT_WCM_WASM_TOOLS_BIN=${NXT_WCM_WASM_TOOLS_BIN=}
+
+
+$echo "configuring $NXT_WCM_MODULE module"
+$echo "configuring $NXT_WCM_MODULE module ..." >> $NXT_AUTOCONF_ERR
+
+$echo -n "looking for rust compiler ... "
+
+if [ -z `which rustc 2>/dev/null` ]; then
+    $echo "not found."
+    exit 1;
+fi
+
+$echo "found."
+
+$echo -n "looking for cargo ... "
+
+if [ -z `which cargo 2>/dev/null` ]; then
+    $echo "not found."
+    exit 1;
+fi
+
+$echo "found."
+
+
+if grep ^$NXT_WCM_MODULE: $NXT_MAKEFILE 2>&1 > /dev/null; then
+    $echo
+    $echo $0: error: duplicate \"$NXT_WCM_MODULE\" module configured.
+    $echo
+    exit 1;
+fi
+
+
+$echo " + $NXT_WCM_MODULE module: $NXT_WCM_MOD_NAME"
+
+
+NXT_OS=$(uname -o)
+
+if [ $NXT_OS = "Darwin" ]; then
+	NXT_CARGO_CMD="cargo rustc --release --manifest-path src/wasm-wasi-component/Cargo.toml -- --emit link=target/release/libwasm_wasi_component.so -C link-args='-undefined dynamic_lookup'"
+else
+	NXT_CARGO_CMD="cargo build --release --manifest-path src/wasm-wasi-component/Cargo.toml"
+fi
+
+
+cat << END >> $NXT_MAKEFILE
+
+.PHONY: ${NXT_WCM_MODULE}
+.PHONY: ${NXT_WCM_MODULE}-install
+.PHONY: ${NXT_WCM_MODULE}-uninstall
+
+all: ${NXT_WCM_MODULE}
+
+${NXT_WCM_MODULE}:	${NXT_WCM_MOD_CARGO}
+
+${NXT_WCM_MOD_CARGO}: build/src/nxt_unit.o
+	$NXT_CARGO_CMD
+
+install: ${NXT_WCM_MODULE}-install
+
+${NXT_WCM_MODULE}-install: ${NXT_WCM_MODULE} install-check
+	install -d \$(DESTDIR)$NXT_MODULESDIR
+	install -p ${NXT_WCM_MOD_CARGO} \\
+		\$(DESTDIR)$NXT_MODULESDIR/$NXT_WCM_MOD_NAME
+
+uninstall: ${NXT_WCM_MODULE}-uninstall
+
+${NXT_WCM_MODULE}-uninstall:
+	rm -f \$(DESTDIR)$NXT_MODULESDIR/$NXT_WCM_MOD_NAME
+	@rmdir -p \$(DESTDIR)$NXT_MODULESDIR 2>/dev/null || true
+
+END