Skip to content

Commit

Permalink
Merged with the 1.32 branch
Browse files Browse the repository at this point in the history
  • Loading branch information
andrey-zelenkov committed Mar 28, 2024
2 parents e75f8d5 + 48d7917 commit c36102a
Show file tree
Hide file tree
Showing 18 changed files with 85 additions and 31 deletions.
9 changes: 9 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@

Changes with Unit 1.32.1 26 Mar 2024

*) Bugfix: NJS variables in templates may have incorrect values due to
improper caching.

*) Bugfix: Wasm application process hangs after receiving restart signal
from the control.


Changes with Unit 1.32.0 27 Feb 2024

*) Feature: WebAssembly Components using WASI interfaces defined in
Expand Down
45 changes: 45 additions & 0 deletions docs/changes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,51 @@ if building with NJS, version 0.8.3 or later is now required.
</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-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.32.0" rev="1"
date="2024-03-26" time="18:00:00 +0000"
packager="Nginx Packaging &lt;[email protected]&gt;">

<change>
<para>
NGINX Unit updated to 1.32.1.
</para>
</change>


</changes>


<changes apply="unit" ver="1.32.1" rev="1"
date="2024-03-26" time="18:00:00 +0000"
packager="Nginx Packaging &lt;[email protected]&gt;">

<change type="bugfix">
<para>
NJS variables in templates may have incorrect values due to improper caching.
</para>
</change>

<change type="bugfix">
<para>
Wasm application process hangs after receiving restart signal from the control.
</para>
</change>

</changes>


<changes apply="unit-jsc21" ver="1.32.0" rev="1"
date="2023-10-17" time="16:00:00 -0700"
packager="Nginx Packaging &lt;[email protected]&gt;">
Expand Down
2 changes: 1 addition & 1 deletion docs/unit-openapi.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
openapi: 3.0.0
info:
title: "NGINX Unit 1.32.0"
title: "NGINX Unit 1.32.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,
Expand Down
4 changes: 2 additions & 2 deletions pkg/docker/Dockerfile.go1.21
Original file line number Diff line number Diff line change
Expand Up @@ -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.32.0"
LABEL org.opencontainers.image.version="1.32.1"

RUN set -ex \
&& savedAptMark="$(apt-mark showmanual)" \
Expand All @@ -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 \
&& git clone --depth 1 -b 1.32.0-1 https://github.com/nginx/unit \
&& git clone --depth 1 -b 1.32.1-1 https://github.com/nginx/unit \
&& cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
Expand Down
4 changes: 2 additions & 2 deletions pkg/docker/Dockerfile.go1.22
Original file line number Diff line number Diff line change
Expand Up @@ -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.32.0"
LABEL org.opencontainers.image.version="1.32.1"

RUN set -ex \
&& savedAptMark="$(apt-mark showmanual)" \
Expand All @@ -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 \
&& git clone --depth 1 -b 1.32.0-1 https://github.com/nginx/unit \
&& git clone --depth 1 -b 1.32.1-1 https://github.com/nginx/unit \
&& cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
Expand Down
4 changes: 2 additions & 2 deletions pkg/docker/Dockerfile.jsc11
Original file line number Diff line number Diff line change
Expand Up @@ -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.32.0"
LABEL org.opencontainers.image.version="1.32.1"

RUN set -ex \
&& savedAptMark="$(apt-mark showmanual)" \
Expand All @@ -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 \
&& git clone --depth 1 -b 1.32.0-1 https://github.com/nginx/unit \
&& git clone --depth 1 -b 1.32.1-1 https://github.com/nginx/unit \
&& cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
Expand Down
4 changes: 2 additions & 2 deletions pkg/docker/Dockerfile.minimal
Original file line number Diff line number Diff line change
Expand Up @@ -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.32.0"
LABEL org.opencontainers.image.version="1.32.1"

RUN set -ex \
&& savedAptMark="$(apt-mark showmanual)" \
Expand All @@ -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 \
&& git clone --depth 1 -b 1.32.0-1 https://github.com/nginx/unit \
&& git clone --depth 1 -b 1.32.1-1 https://github.com/nginx/unit \
&& cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
Expand Down
4 changes: 2 additions & 2 deletions pkg/docker/Dockerfile.node20
Original file line number Diff line number Diff line change
Expand Up @@ -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.32.0"
LABEL org.opencontainers.image.version="1.32.1"

RUN set -ex \
&& savedAptMark="$(apt-mark showmanual)" \
Expand All @@ -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 \
&& git clone --depth 1 -b 1.32.0-1 https://github.com/nginx/unit \
&& git clone --depth 1 -b 1.32.1-1 https://github.com/nginx/unit \
&& cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
Expand Down
4 changes: 2 additions & 2 deletions pkg/docker/Dockerfile.node21
Original file line number Diff line number Diff line change
Expand Up @@ -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.32.0"
LABEL org.opencontainers.image.version="1.32.1"

RUN set -ex \
&& savedAptMark="$(apt-mark showmanual)" \
Expand All @@ -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 \
&& git clone --depth 1 -b 1.32.0-1 https://github.com/nginx/unit \
&& git clone --depth 1 -b 1.32.1-1 https://github.com/nginx/unit \
&& cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
Expand Down
4 changes: 2 additions & 2 deletions pkg/docker/Dockerfile.perl5.36
Original file line number Diff line number Diff line change
Expand Up @@ -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.32.0"
LABEL org.opencontainers.image.version="1.32.1"

RUN set -ex \
&& savedAptMark="$(apt-mark showmanual)" \
Expand All @@ -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 \
&& git clone --depth 1 -b 1.32.0-1 https://github.com/nginx/unit \
&& git clone --depth 1 -b 1.32.1-1 https://github.com/nginx/unit \
&& cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
Expand Down
4 changes: 2 additions & 2 deletions pkg/docker/Dockerfile.perl5.38
Original file line number Diff line number Diff line change
Expand Up @@ -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.32.0"
LABEL org.opencontainers.image.version="1.32.1"

RUN set -ex \
&& savedAptMark="$(apt-mark showmanual)" \
Expand All @@ -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 \
&& git clone --depth 1 -b 1.32.0-1 https://github.com/nginx/unit \
&& git clone --depth 1 -b 1.32.1-1 https://github.com/nginx/unit \
&& cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
Expand Down
4 changes: 2 additions & 2 deletions pkg/docker/Dockerfile.php8.2
Original file line number Diff line number Diff line change
Expand Up @@ -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.32.0"
LABEL org.opencontainers.image.version="1.32.1"

RUN set -ex \
&& savedAptMark="$(apt-mark showmanual)" \
Expand All @@ -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 \
&& git clone --depth 1 -b 1.32.0-1 https://github.com/nginx/unit \
&& git clone --depth 1 -b 1.32.1-1 https://github.com/nginx/unit \
&& cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
Expand Down
4 changes: 2 additions & 2 deletions pkg/docker/Dockerfile.php8.3
Original file line number Diff line number Diff line change
Expand Up @@ -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.32.0"
LABEL org.opencontainers.image.version="1.32.1"

RUN set -ex \
&& savedAptMark="$(apt-mark showmanual)" \
Expand All @@ -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 \
&& git clone --depth 1 -b 1.32.0-1 https://github.com/nginx/unit \
&& git clone --depth 1 -b 1.32.1-1 https://github.com/nginx/unit \
&& cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
Expand Down
4 changes: 2 additions & 2 deletions pkg/docker/Dockerfile.python3.11
Original file line number Diff line number Diff line change
Expand Up @@ -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.32.0"
LABEL org.opencontainers.image.version="1.32.1"

RUN set -ex \
&& savedAptMark="$(apt-mark showmanual)" \
Expand All @@ -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 \
&& git clone --depth 1 -b 1.32.0-1 https://github.com/nginx/unit \
&& git clone --depth 1 -b 1.32.1-1 https://github.com/nginx/unit \
&& cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
Expand Down
4 changes: 2 additions & 2 deletions pkg/docker/Dockerfile.python3.12
Original file line number Diff line number Diff line change
Expand Up @@ -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.32.0"
LABEL org.opencontainers.image.version="1.32.1"

RUN set -ex \
&& savedAptMark="$(apt-mark showmanual)" \
Expand All @@ -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 \
&& git clone --depth 1 -b 1.32.0-1 https://github.com/nginx/unit \
&& git clone --depth 1 -b 1.32.1-1 https://github.com/nginx/unit \
&& cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
Expand Down
4 changes: 2 additions & 2 deletions pkg/docker/Dockerfile.ruby3.2
Original file line number Diff line number Diff line change
Expand Up @@ -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.32.0"
LABEL org.opencontainers.image.version="1.32.1"

RUN set -ex \
&& savedAptMark="$(apt-mark showmanual)" \
Expand All @@ -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 \
&& git clone --depth 1 -b 1.32.0-1 https://github.com/nginx/unit \
&& git clone --depth 1 -b 1.32.1-1 https://github.com/nginx/unit \
&& cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
Expand Down
4 changes: 2 additions & 2 deletions pkg/docker/Dockerfile.ruby3.3
Original file line number Diff line number Diff line change
Expand Up @@ -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.32.0"
LABEL org.opencontainers.image.version="1.32.1"

RUN set -ex \
&& savedAptMark="$(apt-mark showmanual)" \
Expand All @@ -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 \
&& git clone --depth 1 -b 1.32.0-1 https://github.com/nginx/unit \
&& git clone --depth 1 -b 1.32.1-1 https://github.com/nginx/unit \
&& cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
Expand Down
4 changes: 2 additions & 2 deletions pkg/docker/Dockerfile.wasm
Original file line number Diff line number Diff line change
Expand Up @@ -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.32.0"
LABEL org.opencontainers.image.version="1.32.1"

RUN set -ex \
&& savedAptMark="$(apt-mark showmanual)" \
Expand All @@ -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 \
&& git clone --depth 1 -b 1.32.0-1 https://github.com/nginx/unit \
&& git clone --depth 1 -b 1.32.1-1 https://github.com/nginx/unit \
&& cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
Expand Down

0 comments on commit c36102a

Please sign in to comment.