summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authoroxpa <iippolitov@gmail.com>2025-03-03 15:22:09 +0000
committeroxpa <iippolitov@gmail.com>2025-03-03 15:22:09 +0000
commit228377b1ff64b7ffba92c1914de667d8d018b2b3 (patch)
tree285055bed39f1c64920c29e8978f580618f6fbce
parentbdc4d30548c6964f6fedffb27c4e41176a67de05 (diff)
parent8ab74a8cc929272eb8683d3f6ab4cb406465fd34 (diff)
downloadunit-228377b1ff64b7ffba92c1914de667d8d018b2b3.tar.gz
unit-228377b1ff64b7ffba92c1914de667d8d018b2b3.tar.bz2
Merge tag '1.34.2' into packaging1.34.2-1
Unit 1.34.2 release.
-rw-r--r--CHANGES10
-rw-r--r--docs/changes.xml47
-rw-r--r--docs/unit-openapi.yaml2
-rw-r--r--pkg/docker/Dockerfile.go1.224
-rw-r--r--pkg/docker/Dockerfile.go1.234
-rw-r--r--pkg/docker/Dockerfile.jsc114
-rw-r--r--pkg/docker/Dockerfile.minimal4
-rw-r--r--pkg/docker/Dockerfile.node204
-rw-r--r--pkg/docker/Dockerfile.node224
-rw-r--r--pkg/docker/Dockerfile.perl5.384
-rw-r--r--pkg/docker/Dockerfile.perl5.404
-rw-r--r--pkg/docker/Dockerfile.php8.34
-rw-r--r--pkg/docker/Dockerfile.php8.44
-rw-r--r--pkg/docker/Dockerfile.python3.124
-rw-r--r--pkg/docker/Dockerfile.python3.12-slim4
-rw-r--r--pkg/docker/Dockerfile.python3.134
-rw-r--r--pkg/docker/Dockerfile.python3.13-slim4
-rw-r--r--pkg/docker/Dockerfile.ruby3.24
-rw-r--r--pkg/docker/Dockerfile.ruby3.34
-rw-r--r--pkg/docker/Dockerfile.wasm4
-rw-r--r--src/java/nginx/unit/websocket/WsFrameBase.java9
-rw-r--r--tools/unitctl/Cargo.lock6
-rw-r--r--tools/unitctl/openapi-config.json2
-rw-r--r--tools/unitctl/unit-client-rs/Cargo.toml2
-rw-r--r--tools/unitctl/unit-openapi/Cargo.toml2
-rw-r--r--tools/unitctl/unit-openapi/README.md2
-rw-r--r--tools/unitctl/unitctl/Cargo.toml2
-rw-r--r--version4
28 files changed, 110 insertions, 46 deletions
diff --git a/CHANGES b/CHANGES
index ba28f692..87f04c59 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,14 @@
+Changes with Unit 1.34.2 26 Feb 2025
+
+ *) Security: fix missing websocket payload length validation in the Java
+ language module which could lead to Java language module processes
+ consuming excess CPU. (CVE-2025-1695).
+
+ *) Bugfix: fix incorrect websocket payload length calculation in the
+ Java language module.
+
+
Changes with Unit 1.34.1 10 Jan 2025
*) Bugfix: fix instability issues due to OpenTelemetry (OTEL) support.
diff --git a/docs/changes.xml b/docs/changes.xml
index e8151465..f4eef232 100644
--- a/docs/changes.xml
+++ b/docs/changes.xml
@@ -17,6 +17,53 @@
unit-jsc14 unit-jsc15 unit-jsc16 unit-jsc17 unit-jsc18
unit-jsc19 unit-jsc20 unit-jsc21
unit-wasm"
+ ver="1.34.2" rev="1"
+ date="2025-02-26" time="18:00:00 +0000"
+ packager="Nginx Packaging &lt;nginx-packaging@f5.com&gt;">
+
+<change>
+<para>
+NGINX Unit updated to 1.34.2.
+</para>
+</change>
+
+</changes>
+
+
+<changes apply="unit" ver="1.34.2" rev="1"
+ date="2025-02-26" time="18:00:00 +0000"
+ packager="Nginx Packaging &lt;nginx-packaging@f5.com&gt;">
+
+<change type="security">
+<para>
+fix missing websocket payload length validation in the Java language module
+which could lead to Java language module processes consuming excess CPU.
+(CVE-2025-1695).
+
+</para>
+</change>
+
+<change type="bugfix">
+<para>
+fix incorrect websocket payload length calculation in the Java language module.
+</para>
+</change>
+
+</changes>
+
+
+<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-python3.12 unit-python3.13
+ 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-jsc21
+ unit-wasm"
ver="1.34.1" rev="1"
date="2025-01-10" time="18:00:00 +0000"
packager="Nginx Packaging &lt;nginx-packaging@f5.com&gt;">
diff --git a/docs/unit-openapi.yaml b/docs/unit-openapi.yaml
index 7353ead2..0ea38cf3 100644
--- a/docs/unit-openapi.yaml
+++ b/docs/unit-openapi.yaml
@@ -1,6 +1,6 @@
openapi: 3.0.0
info:
- title: "NGINX Unit 1.34.1"
+ title: "NGINX Unit 1.34.2"
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,
diff --git a/pkg/docker/Dockerfile.go1.22 b/pkg/docker/Dockerfile.go1.22
index ea13f312..236aa0f2 100644
--- a/pkg/docker/Dockerfile.go1.22
+++ b/pkg/docker/Dockerfile.go1.22
@@ -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 <docker-maint@nginx.com>"
-LABEL org.opencontainers.image.version="1.34.1"
+LABEL org.opencontainers.image.version="1.34.2"
RUN set -ex \
&& savedAptMark="$(apt-mark showmanual)" \
@@ -35,7 +35,7 @@ RUN set -ex \
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
&& mkdir -p /usr/src/unit \
&& cd /usr/src/unit \
- && git clone --depth 1 -b 1.34.1-1 https://github.com/nginx/unit \
+ && git clone --depth 1 -b 1.34.2-1 https://github.com/nginx/unit \
&& cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
diff --git a/pkg/docker/Dockerfile.go1.23 b/pkg/docker/Dockerfile.go1.23
index 4096bf01..94636cf2 100644
--- a/pkg/docker/Dockerfile.go1.23
+++ b/pkg/docker/Dockerfile.go1.23
@@ -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 <docker-maint@nginx.com>"
-LABEL org.opencontainers.image.version="1.34.1"
+LABEL org.opencontainers.image.version="1.34.2"
RUN set -ex \
&& savedAptMark="$(apt-mark showmanual)" \
@@ -35,7 +35,7 @@ RUN set -ex \
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
&& mkdir -p /usr/src/unit \
&& cd /usr/src/unit \
- && git clone --depth 1 -b 1.34.1-1 https://github.com/nginx/unit \
+ && git clone --depth 1 -b 1.34.2-1 https://github.com/nginx/unit \
&& cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
diff --git a/pkg/docker/Dockerfile.jsc11 b/pkg/docker/Dockerfile.jsc11
index 3595be07..eab2cf7f 100644
--- a/pkg/docker/Dockerfile.jsc11
+++ b/pkg/docker/Dockerfile.jsc11
@@ -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 <docker-maint@nginx.com>"
-LABEL org.opencontainers.image.version="1.34.1"
+LABEL org.opencontainers.image.version="1.34.2"
RUN set -ex \
&& savedAptMark="$(apt-mark showmanual)" \
@@ -35,7 +35,7 @@ RUN set -ex \
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
&& mkdir -p /usr/src/unit \
&& cd /usr/src/unit \
- && git clone --depth 1 -b 1.34.1-1 https://github.com/nginx/unit \
+ && git clone --depth 1 -b 1.34.2-1 https://github.com/nginx/unit \
&& cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
diff --git a/pkg/docker/Dockerfile.minimal b/pkg/docker/Dockerfile.minimal
index 4ec41292..626b36f5 100644
--- a/pkg/docker/Dockerfile.minimal
+++ b/pkg/docker/Dockerfile.minimal
@@ -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 <docker-maint@nginx.com>"
-LABEL org.opencontainers.image.version="1.34.1"
+LABEL org.opencontainers.image.version="1.34.2"
RUN set -ex \
&& savedAptMark="$(apt-mark showmanual)" \
@@ -35,7 +35,7 @@ RUN set -ex \
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
&& mkdir -p /usr/src/unit \
&& cd /usr/src/unit \
- && git clone --depth 1 -b 1.34.1-1 https://github.com/nginx/unit \
+ && git clone --depth 1 -b 1.34.2-1 https://github.com/nginx/unit \
&& cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
diff --git a/pkg/docker/Dockerfile.node20 b/pkg/docker/Dockerfile.node20
index 7bf6f901..7178ef93 100644
--- a/pkg/docker/Dockerfile.node20
+++ b/pkg/docker/Dockerfile.node20
@@ -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 <docker-maint@nginx.com>"
-LABEL org.opencontainers.image.version="1.34.1"
+LABEL org.opencontainers.image.version="1.34.2"
RUN set -ex \
&& savedAptMark="$(apt-mark showmanual)" \
@@ -35,7 +35,7 @@ RUN set -ex \
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
&& mkdir -p /usr/src/unit \
&& cd /usr/src/unit \
- && git clone --depth 1 -b 1.34.1-1 https://github.com/nginx/unit \
+ && git clone --depth 1 -b 1.34.2-1 https://github.com/nginx/unit \
&& cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
diff --git a/pkg/docker/Dockerfile.node22 b/pkg/docker/Dockerfile.node22
index a04dda39..ac1bb474 100644
--- a/pkg/docker/Dockerfile.node22
+++ b/pkg/docker/Dockerfile.node22
@@ -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 <docker-maint@nginx.com>"
-LABEL org.opencontainers.image.version="1.34.1"
+LABEL org.opencontainers.image.version="1.34.2"
RUN set -ex \
&& savedAptMark="$(apt-mark showmanual)" \
@@ -35,7 +35,7 @@ RUN set -ex \
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
&& mkdir -p /usr/src/unit \
&& cd /usr/src/unit \
- && git clone --depth 1 -b 1.34.1-1 https://github.com/nginx/unit \
+ && git clone --depth 1 -b 1.34.2-1 https://github.com/nginx/unit \
&& cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
diff --git a/pkg/docker/Dockerfile.perl5.38 b/pkg/docker/Dockerfile.perl5.38
index 15564a07..dc8dede9 100644
--- a/pkg/docker/Dockerfile.perl5.38
+++ b/pkg/docker/Dockerfile.perl5.38
@@ -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 <docker-maint@nginx.com>"
-LABEL org.opencontainers.image.version="1.34.1"
+LABEL org.opencontainers.image.version="1.34.2"
RUN set -ex \
&& savedAptMark="$(apt-mark showmanual)" \
@@ -35,7 +35,7 @@ RUN set -ex \
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
&& mkdir -p /usr/src/unit \
&& cd /usr/src/unit \
- && git clone --depth 1 -b 1.34.1-1 https://github.com/nginx/unit \
+ && git clone --depth 1 -b 1.34.2-1 https://github.com/nginx/unit \
&& cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
diff --git a/pkg/docker/Dockerfile.perl5.40 b/pkg/docker/Dockerfile.perl5.40
index f6339366..4e5cb320 100644
--- a/pkg/docker/Dockerfile.perl5.40
+++ b/pkg/docker/Dockerfile.perl5.40
@@ -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 <docker-maint@nginx.com>"
-LABEL org.opencontainers.image.version="1.34.1"
+LABEL org.opencontainers.image.version="1.34.2"
RUN set -ex \
&& savedAptMark="$(apt-mark showmanual)" \
@@ -35,7 +35,7 @@ RUN set -ex \
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
&& mkdir -p /usr/src/unit \
&& cd /usr/src/unit \
- && git clone --depth 1 -b 1.34.1-1 https://github.com/nginx/unit \
+ && git clone --depth 1 -b 1.34.2-1 https://github.com/nginx/unit \
&& cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
diff --git a/pkg/docker/Dockerfile.php8.3 b/pkg/docker/Dockerfile.php8.3
index 9351b8c4..e8476aa6 100644
--- a/pkg/docker/Dockerfile.php8.3
+++ b/pkg/docker/Dockerfile.php8.3
@@ -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 <docker-maint@nginx.com>"
-LABEL org.opencontainers.image.version="1.34.1"
+LABEL org.opencontainers.image.version="1.34.2"
RUN set -ex \
&& savedAptMark="$(apt-mark showmanual)" \
@@ -35,7 +35,7 @@ RUN set -ex \
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
&& mkdir -p /usr/src/unit \
&& cd /usr/src/unit \
- && git clone --depth 1 -b 1.34.1-1 https://github.com/nginx/unit \
+ && git clone --depth 1 -b 1.34.2-1 https://github.com/nginx/unit \
&& cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
diff --git a/pkg/docker/Dockerfile.php8.4 b/pkg/docker/Dockerfile.php8.4
index 953cf5b7..82a4c915 100644
--- a/pkg/docker/Dockerfile.php8.4
+++ b/pkg/docker/Dockerfile.php8.4
@@ -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 <docker-maint@nginx.com>"
-LABEL org.opencontainers.image.version="1.34.1"
+LABEL org.opencontainers.image.version="1.34.2"
RUN set -ex \
&& savedAptMark="$(apt-mark showmanual)" \
@@ -35,7 +35,7 @@ RUN set -ex \
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
&& mkdir -p /usr/src/unit \
&& cd /usr/src/unit \
- && git clone --depth 1 -b 1.34.1-1 https://github.com/nginx/unit \
+ && git clone --depth 1 -b 1.34.2-1 https://github.com/nginx/unit \
&& cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
diff --git a/pkg/docker/Dockerfile.python3.12 b/pkg/docker/Dockerfile.python3.12
index 5791d935..0bbd44a5 100644
--- a/pkg/docker/Dockerfile.python3.12
+++ b/pkg/docker/Dockerfile.python3.12
@@ -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 <docker-maint@nginx.com>"
-LABEL org.opencontainers.image.version="1.34.1"
+LABEL org.opencontainers.image.version="1.34.2"
RUN set -ex \
&& savedAptMark="$(apt-mark showmanual)" \
@@ -35,7 +35,7 @@ RUN set -ex \
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
&& mkdir -p /usr/src/unit \
&& cd /usr/src/unit \
- && git clone --depth 1 -b 1.34.1-1 https://github.com/nginx/unit \
+ && git clone --depth 1 -b 1.34.2-1 https://github.com/nginx/unit \
&& cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
diff --git a/pkg/docker/Dockerfile.python3.12-slim b/pkg/docker/Dockerfile.python3.12-slim
index cc2ba83a..0773d87d 100644
--- a/pkg/docker/Dockerfile.python3.12-slim
+++ b/pkg/docker/Dockerfile.python3.12-slim
@@ -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 <docker-maint@nginx.com>"
-LABEL org.opencontainers.image.version="1.34.1"
+LABEL org.opencontainers.image.version="1.34.2"
RUN set -ex \
&& savedAptMark="$(apt-mark showmanual)" \
@@ -35,7 +35,7 @@ RUN set -ex \
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
&& mkdir -p /usr/src/unit \
&& cd /usr/src/unit \
- && git clone --depth 1 -b 1.34.1-1 https://github.com/nginx/unit \
+ && git clone --depth 1 -b 1.34.2-1 https://github.com/nginx/unit \
&& cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
diff --git a/pkg/docker/Dockerfile.python3.13 b/pkg/docker/Dockerfile.python3.13
index a3859b4a..3e225c0a 100644
--- a/pkg/docker/Dockerfile.python3.13
+++ b/pkg/docker/Dockerfile.python3.13
@@ -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 <docker-maint@nginx.com>"
-LABEL org.opencontainers.image.version="1.34.1"
+LABEL org.opencontainers.image.version="1.34.2"
RUN set -ex \
&& savedAptMark="$(apt-mark showmanual)" \
@@ -35,7 +35,7 @@ RUN set -ex \
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
&& mkdir -p /usr/src/unit \
&& cd /usr/src/unit \
- && git clone --depth 1 -b 1.34.1-1 https://github.com/nginx/unit \
+ && git clone --depth 1 -b 1.34.2-1 https://github.com/nginx/unit \
&& cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
diff --git a/pkg/docker/Dockerfile.python3.13-slim b/pkg/docker/Dockerfile.python3.13-slim
index b38a9627..a4769d46 100644
--- a/pkg/docker/Dockerfile.python3.13-slim
+++ b/pkg/docker/Dockerfile.python3.13-slim
@@ -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 <docker-maint@nginx.com>"
-LABEL org.opencontainers.image.version="1.34.1"
+LABEL org.opencontainers.image.version="1.34.2"
RUN set -ex \
&& savedAptMark="$(apt-mark showmanual)" \
@@ -35,7 +35,7 @@ RUN set -ex \
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
&& mkdir -p /usr/src/unit \
&& cd /usr/src/unit \
- && git clone --depth 1 -b 1.34.1-1 https://github.com/nginx/unit \
+ && git clone --depth 1 -b 1.34.2-1 https://github.com/nginx/unit \
&& cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
diff --git a/pkg/docker/Dockerfile.ruby3.2 b/pkg/docker/Dockerfile.ruby3.2
index 6621487e..0a6e1529 100644
--- a/pkg/docker/Dockerfile.ruby3.2
+++ b/pkg/docker/Dockerfile.ruby3.2
@@ -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 <docker-maint@nginx.com>"
-LABEL org.opencontainers.image.version="1.34.1"
+LABEL org.opencontainers.image.version="1.34.2"
RUN set -ex \
&& savedAptMark="$(apt-mark showmanual)" \
@@ -35,7 +35,7 @@ RUN set -ex \
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
&& mkdir -p /usr/src/unit \
&& cd /usr/src/unit \
- && git clone --depth 1 -b 1.34.1-1 https://github.com/nginx/unit \
+ && git clone --depth 1 -b 1.34.2-1 https://github.com/nginx/unit \
&& cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
diff --git a/pkg/docker/Dockerfile.ruby3.3 b/pkg/docker/Dockerfile.ruby3.3
index c2e60574..a2cfc25b 100644
--- a/pkg/docker/Dockerfile.ruby3.3
+++ b/pkg/docker/Dockerfile.ruby3.3
@@ -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 <docker-maint@nginx.com>"
-LABEL org.opencontainers.image.version="1.34.1"
+LABEL org.opencontainers.image.version="1.34.2"
RUN set -ex \
&& savedAptMark="$(apt-mark showmanual)" \
@@ -35,7 +35,7 @@ RUN set -ex \
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
&& mkdir -p /usr/src/unit \
&& cd /usr/src/unit \
- && git clone --depth 1 -b 1.34.1-1 https://github.com/nginx/unit \
+ && git clone --depth 1 -b 1.34.2-1 https://github.com/nginx/unit \
&& cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
diff --git a/pkg/docker/Dockerfile.wasm b/pkg/docker/Dockerfile.wasm
index 0b144f52..2ff9cdef 100644
--- a/pkg/docker/Dockerfile.wasm
+++ b/pkg/docker/Dockerfile.wasm
@@ -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 <docker-maint@nginx.com>"
-LABEL org.opencontainers.image.version="1.34.1"
+LABEL org.opencontainers.image.version="1.34.2"
RUN set -ex \
&& savedAptMark="$(apt-mark showmanual)" \
@@ -35,7 +35,7 @@ RUN set -ex \
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
&& mkdir -p /usr/src/unit \
&& cd /usr/src/unit \
- && git clone --depth 1 -b 1.34.1-1 https://github.com/nginx/unit \
+ && git clone --depth 1 -b 1.34.2-1 https://github.com/nginx/unit \
&& cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
diff --git a/src/java/nginx/unit/websocket/WsFrameBase.java b/src/java/nginx/unit/websocket/WsFrameBase.java
index 06d20bf4..f07a8962 100644
--- a/src/java/nginx/unit/websocket/WsFrameBase.java
+++ b/src/java/nginx/unit/websocket/WsFrameBase.java
@@ -260,6 +260,13 @@ public abstract class WsFrameBase {
} else if (payloadLength == 127) {
payloadLength = byteArrayToLong(inputBuffer.array(),
inputBuffer.arrayOffset() + inputBuffer.position(), 8);
+ // The most significant bit of those 8 bytes is required to be zero
+ // (see RFC 6455, section 5.2). If the most significant bit is set,
+ // the resulting payload length will be negative so test for that.
+ if (payloadLength < 0) {
+ throw new WsIOException(
+ new CloseReason(CloseCodes.PROTOCOL_ERROR, sm.getString("wsFrame.payloadMsbInvalid")));
+ }
inputBuffer.position(inputBuffer.position() + 8);
}
if (Util.isControl(opCode)) {
@@ -670,7 +677,7 @@ public abstract class WsFrameBase {
int shift = 0;
long result = 0;
for (int i = start + len - 1; i >= start; i--) {
- result = result + ((b[i] & 0xFF) << shift);
+ result = result + ((b[i] & 0xFFL) << shift);
shift += 8;
}
return result;
diff --git a/tools/unitctl/Cargo.lock b/tools/unitctl/Cargo.lock
index b28e591d..24ad02bc 100644
--- a/tools/unitctl/Cargo.lock
+++ b/tools/unitctl/Cargo.lock
@@ -2185,7 +2185,7 @@ checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
[[package]]
name = "unit-client-rs"
-version = "1.34.1"
+version = "1.34.2"
dependencies = [
"bollard",
"custom_error",
@@ -2208,7 +2208,7 @@ dependencies = [
[[package]]
name = "unit-openapi"
-version = "1.34.1"
+version = "1.34.2"
dependencies = [
"base64 0.21.7",
"futures",
@@ -2222,7 +2222,7 @@ dependencies = [
[[package]]
name = "unitctl"
-version = "1.34.1"
+version = "1.34.2"
dependencies = [
"clap",
"colored_json",
diff --git a/tools/unitctl/openapi-config.json b/tools/unitctl/openapi-config.json
index df0e6e85..f35c4b08 100644
--- a/tools/unitctl/openapi-config.json
+++ b/tools/unitctl/openapi-config.json
@@ -1,6 +1,6 @@
{
"packageName": "unit-openapi",
- "packageVersion": "1.34.1",
+ "packageVersion": "1.34.2",
"library": "hyper",
"preferUnsignedInt": true
}
diff --git a/tools/unitctl/unit-client-rs/Cargo.toml b/tools/unitctl/unit-client-rs/Cargo.toml
index ce10231a..d345c112 100644
--- a/tools/unitctl/unit-client-rs/Cargo.toml
+++ b/tools/unitctl/unit-client-rs/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "unit-client-rs"
-version = "1.34.1"
+version = "1.34.2"
authors = ["Elijah Zupancic"]
edition = "2021"
license = "Apache-2.0"
diff --git a/tools/unitctl/unit-openapi/Cargo.toml b/tools/unitctl/unit-openapi/Cargo.toml
index 1b0b3bcf..883535be 100644
--- a/tools/unitctl/unit-openapi/Cargo.toml
+++ b/tools/unitctl/unit-openapi/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "unit-openapi"
-version = "1.34.1"
+version = "1.34.2"
authors = ["unit-owner@nginx.org"]
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, handling TLS and request routing. **Important**: Unit's API is designed to expose any part of its configuration as an addressable endpoint. Suppose a JSON object is stored at `/config/listeners/`: ```json { \"*:8080\": { \"pass\": \"applications/wp_emea_dev\" } } ``` Here, `/config/listeners/_*:8080` and `/config/listeners/_*:8080/pass` are also endpoints. Generally, object options are addressable by their names, array items—by their indexes (`/array/0/`). **Note**: By default, Unit is configured through a UNIX domain socket. To use this specification with OpenAPI tools interactively, [start](https://unit.nginx.org/howto/source/#source-startup) Unit with a TCP port as the control socket."
license = "Apache 2.0"
diff --git a/tools/unitctl/unit-openapi/README.md b/tools/unitctl/unit-openapi/README.md
index e9de1a1c..9e8e6d42 100644
--- a/tools/unitctl/unit-openapi/README.md
+++ b/tools/unitctl/unit-openapi/README.md
@@ -21,7 +21,7 @@ For more information, please visit [https://unit.nginx.org/](https://unit.nginx.
This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project. By using the [openapi-spec](https://openapis.org) from a remote server, you can easily generate an API client.
- API version: 0.2.0
-- Package version: 1.34.1
+- Package version: 1.34.2
- Generator version: 7.6.0
- Build package: `org.openapitools.codegen.languages.RustClientCodegen`
diff --git a/tools/unitctl/unitctl/Cargo.toml b/tools/unitctl/unitctl/Cargo.toml
index 02ac6043..b364ba90 100644
--- a/tools/unitctl/unitctl/Cargo.toml
+++ b/tools/unitctl/unitctl/Cargo.toml
@@ -1,7 +1,7 @@
[package]
name = "unitctl"
description = "CLI interface to the NGINX Unit Control API"
-version = "1.34.1"
+version = "1.34.2"
authors = ["Elijah Zupancic"]
edition = "2021"
license = "Apache-2.0"
diff --git a/version b/version
index 99407a45..a8d69afb 100644
--- a/version
+++ b/version
@@ -1,5 +1,5 @@
# Copyright (C) NGINX, Inc.
-NXT_VERSION=1.34.1
-NXT_VERNUM=13401
+NXT_VERSION=1.34.2
+NXT_VERNUM=13402