Merged with the default branch.

Author: Ippolitov Igor

.hgtags

@@ -73,3 +73,4 @@ e7b7f2bb04e8c6f4cbe6374fd6960d4465654215 1.29.1-1
 8a0b4338a15648792bcad47edb53f1b1c0badeb4 1.30.0-1
 3a9046dca2a6c51ee2df2cabdf69cb9a83e7a1e6 1.31.0
 ef8ddca63f2c1a3e1758968740837b921dd953dc 1.31.0-1
+25aafe2ff61e0424b3245f4e3d40eb1fa7611063 1.31.1

CHANGES

@@ -1,4 +1,31 @@
 
+Changes with Unit 1.31.1                                         19 Oct 2023
+
+    *) Feature: allow to set the HTTP response status in Wasm module.
+
+    *) Feature: allow uploads larger than 4GiB in Wasm module.
+
+    *) Bugfix: application process could crash while rewriting URLs with
+       query strings.
+
+    *) Bugfix: requests larger than about 64MiB could cause error in Wasm
+       module.
+
+    *) Bugfix: when using many headers in Java module some of them could be
+       corrupted due to memory realocation issue.
+
+    *) Bugfix: ServerRequest.destroy() implemented in Node.js module to make
+       it compatible with some frameworks that might use it.
+
+    *) Bugfix: chunk argument of ServerResponse.write() can now be a
+       Uint8Array to improve compatibility with Node.js 15.0.0 and above.
+
+    *) Bugfix: Node.JS unit-http NPM module now has appropriate default
+       paths for macOS/arm64 systems.
+
+    *) Bugfix: build on musl libc with clang.
+
+
 Changes with Unit 1.31.0                                         31 Aug 2023
 
     *) Change: if building with njs, version 0.8.0 or later is now required.

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.75
+NXT_TOMCAT_VERSION=9.0.82
 
 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.51.v20230217
+NXT_JAR_VERSION=9.4.53.v20231009
 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.158
+NXT_JAR_VERSION=4.8.162
 NXT_JAR_NAMESPACE=io/github/classgraph/
 . auto/modules/java_get_jar
 

auto/modules/java_jar.sha512

@@ -1,14 +1,14 @@
-00dc1aedae7cb6600b4b27ac7ec0234981a23a8c6f03dc1881304b7d999d94f0fdaa51e0008288740d9890b34f41462e8ed82c76f36a18bd45eabbb8084ec8d4  classgraph-4.8.158.jar
+a117092f4ab77ef89b3b83a45b9e33c0360cb18098df17da77e5d765a6b5cea1fae6190399217236c0d970f2b3603bc8f408c2471cf8854de1282dba7525c335  classgraph-4.8.162.jar
 ab441acf5551a7dc81c353eaccb3b3df9e89a48987294d19e39acdb83a5b640fcdff7414cee29f5b96eaa8826647f1d5323e185018fe33a64c402d69c73c9158  ecj-3.26.0.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
+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

docs/changes.xml

@@ -5,6 +5,95 @@
 <change_log title="unit">
 
 
+<changes apply="unit-php
+                unit-python unit-python2.7
+                unit-python3.4 unit-python3.5 unit-python3.6 unit-python3.7
+                unit-python3.8 unit-python3.9 unit-python3.10 unit-python3.11
+                unit-go
+                unit-perl
+                unit-ruby
+                unit-jsc-common unit-jsc8 unit-jsc10 unit-jsc11 unit-jsc13
+                unit-jsc14 unit-jsc15 unit-jsc16 unit-jsc17 unit-jsc18
+                unit-jsc19 unit-jsc20
+                unit-wasm"
+         ver="1.31.1" rev="1"
+         date="2023-10-19" time="18:00:00 +0300"
+         packager="Nginx Packaging &lt;[email protected]&gt;">
+
+<change>
+<para>
+NGINX Unit updated to 1.31.1.
+</para>
+</change>
+
+</changes>
+
+
+<changes apply="unit" ver="1.31.1" rev="1"
+         date="2023-10-19" time="18:00:00 +0300"
+         packager="Nginx Packaging &lt;[email protected]&gt;">
+
+<change type="feature">
+<para>
+allow to set the HTTP response status in Wasm module.
+</para>
+</change>
+
+<change type="feature">
+<para>
+allow uploads larger than 4GiB in Wasm module.
+</para>
+</change>
+
+<change type="bugfix">
+<para>
+application process could crash while rewriting URLs with query strings.
+</para>
+</change>
+
+<change type="bugfix">
+<para>
+requests larger than about 64MiB could cause error in Wasm module.
+</para>
+</change>
+
+<change type="bugfix">
+<para>
+when using many headers in Java module some of them could be
+corrupted due to memory realocation issue.
+</para>
+</change>
+
+<change type="bugfix">
+<para>
+ServerRequest.destroy() implemented in Node.js module to make it compatible
+with some frameworks that might use it.
+</para>
+</change>
+
+<change type="bugfix">
+<para>
+chunk argument of ServerResponse.write() can now be a Uint8Array to improve
+compatibility with Node.js 15.0.0 and above.
+</para>
+</change>
+
+<change type="bugfix">
+<para>
+Node.JS unit-http NPM module now has appropriate default paths for
+macOS/arm64 systems.
+</para>
+</change>
+
+<change type="bugfix">
+<para>
+build on musl libc with clang.
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="unit-php
                 unit-python unit-python2.7
                 unit-python3.4 unit-python3.5 unit-python3.6 unit-python3.7

docs/unit-openapi.yaml

@@ -1,6 +1,6 @@
 openapi: 3.0.0
 info:
-  title: "NGINX Unit 1.30.0"
+  title: "NGINX Unit 1.31.1"
   description: "NGINX Unit is a lightweight and versatile application runtime
     that provides the essential components for your web application as a
     single open-source server: running application code, serving static assets,
@@ -5887,6 +5887,7 @@ components:
       description: "An object whose options define a step's action."
       oneOf:
         - $ref: "#/components/schemas/configRouteStepActionPass"
+        - $ref: "#/components/schemas/configRouteStepActionProxy"
         - $ref: "#/components/schemas/configRouteStepActionReturn"
         - $ref: "#/components/schemas/configRouteStepActionShare"
 
@@ -5903,6 +5904,32 @@ components:
           description: "Destination to which the action passes
             incoming requests."
 
+        rewrite:
+          $ref: "#/components/schemas/configRouteStepActionRewrite"
+
+        response_headers:
+          $ref: "#/components/schemas/configRouteStepActionResponseHeaders"
+
+    #/config/routes/{stepIndex}/action/proxy
+    #/config/routes/{routeName}/{stepIndex}/action/proxy
+    configRouteStepActionProxy:
+      type: object
+      description: "An object whose single option defines a step's proxy
+        action."
+      required:
+        - proxy
+      properties:
+        proxy:
+          type: string
+          description: "Socket address of an HTTP server to where the request
+            is proxied."
+
+        rewrite:
+          $ref: "#/components/schemas/configRouteStepActionRewrite"
+
+        response_headers:
+          $ref: "#/components/schemas/configRouteStepActionResponseHeaders"
+
     #/config/routes/{stepIndex}/action/return
     #/config/routes/{routeName}/{stepIndex}/action/return
     configRouteStepActionReturn:
@@ -5922,6 +5949,12 @@ components:
           type: string
           description: "URI; used if the return value implies redirection."
 
+        rewrite:
+          $ref: "#/components/schemas/configRouteStepActionRewrite"
+
+        response_headers:
+          $ref: "#/components/schemas/configRouteStepActionResponseHeaders"
+
     #/config/routes/{stepIndex}/action/share
     #/config/routes/{routeName}/{stepIndex}/action/share
     configRouteStepActionShare:
@@ -5964,6 +5997,28 @@ components:
           description: "Turns on and off mount point resolution."
           default: true
 
+        rewrite:
+          $ref: "#/components/schemas/configRouteStepActionRewrite"
+
+        response_headers:
+          $ref: "#/components/schemas/configRouteStepActionResponseHeaders"
+
+    #/config/routes/{stepIndex}/action/rewrite
+    #/config/routes/{routeName}/{stepIndex}/action/rewrite
+    configRouteStepActionRewrite:
+      type: string
+      description: "Updates the URI of the incoming request before the action
+        is applied."
+
+    #/config/routes/{stepIndex}/action/response_headers
+    #/config/routes/{routeName}/{stepIndex}/action/response_headers
+    configRouteStepActionResponseHeaders:
+      type: object
+      description: "Updates the header fields of Unit’s response before the
+        action is taken."
+      additionalProperties:
+        type: string
+
     # /config/listeners/
     configListeners:
       type: object

pkg/contrib/src/njs/SHA512SUMS

@@ -1 +1 @@
-200f3ae1e1909f0d8086e2fbfbd6b8654e596f3ad2e4cf4d863e201cfcb2f86a419fa9061067cbededf6a8c792c1a5ecf60c3a4c983af044c179bb9fe619eea5  njs-0.8.0.tar.gz
+5038b4cd9e18de89c9cf7fe7b25a0a8a03c51cfb20b6ee5085e68f885113b104092baf5ac8fe80e9d1611b2f75e47448753e6b327bef2e706ea46f2d6299f927  njs-0.8.1.tar.gz

pkg/contrib/src/njs/version

@@ -1 +1 @@
-NJS_VERSION := 0.8.0
+NJS_VERSION := 0.8.1

pkg/docker/Dockerfile.go1.20

@@ -6,7 +6,7 @@ LABEL org.opencontainers.image.url="https://unit.nginx.org"
 LABEL org.opencontainers.image.source="https://github.com/nginx/unit"
 LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installation/#docker-images"
 LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers <[email protected]>"
-LABEL org.opencontainers.image.version="1.31.0"
+LABEL org.opencontainers.image.version="1.31.1"
 
 RUN set -ex \
     && savedAptMark="$(apt-mark showmanual)" \
@@ -15,7 +15,7 @@ RUN set -ex \
     && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
     && mkdir -p /usr/src/unit \
     && cd /usr/src/unit \
-    && hg clone -u 1.31.0-1 https://hg.nginx.org/unit \
+    && hg clone -u 1.31.1-1 https://hg.nginx.org/unit \
     && cd unit \
     && NCPU="$(getconf _NPROCESSORS_ONLN)" \
     && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \

pkg/docker/Dockerfile.go1.21

@@ -6,7 +6,7 @@ LABEL org.opencontainers.image.url="https://unit.nginx.org"
 LABEL org.opencontainers.image.source="https://github.com/nginx/unit"
 LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installation/#docker-images"
 LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers <[email protected]>"
-LABEL org.opencontainers.image.version="1.31.0"
+LABEL org.opencontainers.image.version="1.31.1"
 
 RUN set -ex \
     && savedAptMark="$(apt-mark showmanual)" \
@@ -15,7 +15,7 @@ RUN set -ex \
     && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
     && mkdir -p /usr/src/unit \
     && cd /usr/src/unit \
-    && hg clone -u 1.31.0-1 https://hg.nginx.org/unit \
+    && hg clone -u 1.31.1-1 https://hg.nginx.org/unit \
     && cd unit \
     && NCPU="$(getconf _NPROCESSORS_ONLN)" \
     && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \