Skip to content

Commit 7634ab0

Browse files
defanatordefanator
committed
Merged with the 1.26 branch.
2 parents 5dfde97 + 85908c0 commit 7634ab0

31 files changed

+238
-71
lines changed

‎.hgtags

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,4 @@ ad6aad2450c256d4f1a3c32f7091a78dbbc4a6d1 1.23.0-1
5959
aa207ced9712132040e6153ceccdaf04c112d02c 1.25.0-1
6060
2be7b623fbfafdb470d832a28abb1cd55c76e04f 1.26.0
6161
1613ff17671df2273d48be57115f5fe4827f8cd5 1.26.0-1
62+
1a08f884b24effa8b843d6aeeaf016b6354d1256 1.26.1

‎CHANGES

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,22 @@
11

2+
Changes with Unit 1.26.1 02 Dec 2021
3+
4+
*) Bugfix: occasionally, the Unit daemon was unable to fully terminate;
5+
the bug had appeared in 1.26.0.
6+
7+
*) Bugfix: a prototype process could crash on an application process
8+
exit; the bug had appeared in 1.26.0.
9+
10+
*) Bugfix: the router process crashed on reconfiguration if "access_log"
11+
was configured without listeners.
12+
13+
*) Bugfix: a segmentation fault occurred in the PHP module if chdir() or
14+
fastcgi_finish_request() was called in the OPcache preloading script.
15+
16+
*) Bugfix: fatal errors on DragonFly BSD; the bug had appeared in
17+
1.26.0.
18+
19+
220
Changes with Unit 1.26.0 18 Nov 2021
321

422
*) Change: the "share" option now specifies the entire path to the files

‎auto/sockets

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -166,51 +166,53 @@ if [ $nxt_found = no ]; then
166166
fi
167167

168168

169-
nxt_feature="sockopt SO_PASSCRED"
170-
nxt_feature_name=NXT_HAVE_SOCKOPT_SO_PASSCRED
171-
nxt_feature_run=
172-
nxt_feature_incs=
173-
nxt_feature_libs=
174-
nxt_feature_test="#define _GNU_SOURCE
175-
#include <sys/socket.h>
169+
if [ $NXT_SYSTEM != DragonFly ]; then
170+
nxt_feature="sockopt SO_PASSCRED"
171+
nxt_feature_name=NXT_HAVE_SOCKOPT_SO_PASSCRED
172+
nxt_feature_run=
173+
nxt_feature_incs=
174+
nxt_feature_libs=
175+
nxt_feature_test="#define _GNU_SOURCE
176+
#include <sys/socket.h>
176177

177-
int main() {
178-
return SO_PASSCRED == 0;
179-
}"
180-
. auto/feature
178+
int main() {
179+
return SO_PASSCRED == 0;
180+
}"
181+
. auto/feature
181182

182183

183-
if [ $nxt_found = yes ]; then
184-
nxt_feature="struct ucred"
185-
nxt_feature_name=NXT_HAVE_UCRED
184+
if [ $nxt_found = yes ]; then
185+
nxt_feature="struct ucred"
186+
nxt_feature_name=NXT_HAVE_UCRED
187+
nxt_feature_run=
188+
nxt_feature_incs=
189+
nxt_feature_libs=
190+
nxt_feature_test="#define _GNU_SOURCE
191+
#include <sys/socket.h>
192+
#include <sys/un.h>
193+
194+
int main() {
195+
return sizeof(struct ucred);
196+
}"
197+
. auto/feature
198+
fi
199+
200+
201+
nxt_feature="struct cmsgcred"
202+
nxt_feature_name=NXT_HAVE_MSGHDR_CMSGCRED
186203
nxt_feature_run=
187204
nxt_feature_incs=
188205
nxt_feature_libs=
189206
nxt_feature_test="#define _GNU_SOURCE
190207
#include <sys/socket.h>
191-
#include <sys/un.h>
192208

193209
int main() {
194-
return sizeof(struct ucred);
210+
return sizeof(struct cmsgcred);
195211
}"
196212
. auto/feature
197213
fi
198214

199215

200-
nxt_feature="struct cmsgcred"
201-
nxt_feature_name=NXT_HAVE_MSGHDR_CMSGCRED
202-
nxt_feature_run=
203-
nxt_feature_incs=
204-
nxt_feature_libs=
205-
nxt_feature_test="#define _GNU_SOURCE
206-
#include <sys/socket.h>
207-
208-
int main() {
209-
return sizeof(struct cmsgcred);
210-
}"
211-
. auto/feature
212-
213-
214216
nxt_feature="sys/filio.h"
215217
nxt_feature_name=NXT_HAVE_SYS_FILIO_H
216218
nxt_feature_run=

‎docs/changes.xml

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,69 @@
55
<change_log title="unit">
66

77

8+
<changes apply="unit-php
9+
unit-python unit-python2.7
10+
unit-python3.4 unit-python3.5 unit-python3.6 unit-python3.7
11+
unit-python3.8 unit-python3.9 unit-python3.10
12+
unit-go
13+
unit-perl
14+
unit-ruby
15+
unit-jsc-common unit-jsc8 unit-jsc10 unit-jsc11 unit-jsc13
16+
unit-jsc14 unit-jsc15 unit-jsc16 unit-jsc17 unit-jsc18"
17+
ver="1.26.1" rev="1"
18+
date="2021-12-02" time="18:00:00 +0300"
19+
packager="Andrei Belov &lt;[email protected]&gt;">
20+
21+
<change>
22+
<para>
23+
NGINX Unit updated to 1.26.1.
24+
</para>
25+
</change>
26+
27+
</changes>
28+
29+
30+
<changes apply="unit" ver="1.26.1" rev="1"
31+
date="2021-12-02" time="18:00:00 +0300"
32+
packager="Andrei Belov &lt;[email protected]&gt;">
33+
34+
<change type="bugfix">
35+
<para>
36+
occasionally, the Unit daemon was unable to fully terminate; the bug had
37+
appeared in 1.26.0.
38+
</para>
39+
</change>
40+
41+
<change type="bugfix">
42+
<para>
43+
a prototype process could crash on an application process exit; the bug had
44+
appeared in 1.26.0.
45+
</para>
46+
</change>
47+
48+
<change type="bugfix">
49+
<para>
50+
the router process crashed on reconfiguration if "access_log" was configured
51+
without listeners.
52+
</para>
53+
</change>
54+
55+
<change type="bugfix">
56+
<para>
57+
a segmentation fault occurred in the PHP module if chdir() or
58+
fastcgi_finish_request() was called in the OPcache preloading script.
59+
</para>
60+
</change>
61+
62+
<change type="bugfix">
63+
<para>
64+
fatal errors on DragonFly BSD; the bug had appeared in 1.26.0.
65+
</para>
66+
</change>
67+
68+
</changes>
69+
70+
871
<changes apply="unit-jsc18" ver="1.26.0" rev="1"
972
date="2021-11-18" time="18:00:00 +0300"
1073
packager="Andrei Belov &lt;[email protected]&gt;">

‎pkg/deb/debian.module/control-noarch.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ Source: %%NAME%%
22
Section: admin
33
Priority: extra
44
Maintainer: %%PACKAGE_VENDOR%%
5-
Build-Depends: debhelper (>= 9),
5+
Build-Depends: debhelper (>= 11),
66
linux-libc-dev%%MODULE_BUILD_DEPENDS%%
7-
Standards-Version: 3.9.5
7+
Standards-Version: 4.1.4
88
Homepage: https://unit.nginx.org
99

1010
Package: %%NAME%%

‎pkg/deb/debian.module/control.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ Source: %%NAME%%
22
Section: admin
33
Priority: extra
44
Maintainer: %%PACKAGE_VENDOR%%
5-
Build-Depends: debhelper (>= 9),
5+
Build-Depends: debhelper (>= 11),
66
linux-libc-dev,
77
libssl-dev,
88
libpcre2-dev%%MODULE_BUILD_DEPENDS%%
9-
Standards-Version: 3.9.5
9+
Standards-Version: 4.1.4
1010
Homepage: https://unit.nginx.org
1111

1212
Package: %%NAME%%

‎pkg/deb/debian/control.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ Source: unit
22
Section: admin
33
Priority: extra
44
Maintainer: %%PACKAGE_VENDOR%%
5-
Build-Depends: debhelper (>= 9),
5+
Build-Depends: debhelper (>= 11),
66
linux-libc-dev,
77
libssl-dev,
88
libpcre2-dev
9-
Standards-Version: 3.9.5
9+
Standards-Version: 4.1.4
1010
Homepage: https://unit.nginx.org
1111

1212
Package: unit

‎pkg/deb/debian/rules.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@ install: build do.tests
9999
dh_testroot
100100
dh_prep
101101
dh_installdirs
102-
dh_installsystemd
102+
dh_installsystemd -punit --name=unit unit.service
103+
dh_installsystemd -punit --name=unit-debug --no-start --no-enable unit-debug.service
103104
dh_installlogrotate
104105
cd $(BUILDDIR_unit) && DESTDIR=$(INSTALLDIR) make install
105106
cd $(BUILDDIR_unit) && DESTDIR=$(INSTALLDIR_dev) make libunit-install

‎pkg/deb/debian/unit-debug.service

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
[Unit]
2+
Description=NGINX Unit
3+
Wants=network-online.target
4+
After=network-online.target
5+
6+
[Service]
7+
Type=forking
8+
PIDFile=/var/run/unit.pid
9+
EnvironmentFile=-/etc/default/unit
10+
ExecStart=/usr/sbin/unitd-debug $DAEMON_ARGS
11+
ExecReload=
12+
13+
[Install]
14+
WantedBy=multi-user.target

‎pkg/docker/Dockerfile.go1.17

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN set -ex \
88
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
99
&& hg clone https://hg.nginx.org/unit \
1010
&& cd unit \
11-
&& hg up 1.26.0 \
11+
&& hg up 1.26.1 \
1212
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
1313
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
1414
&& CC_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_CFLAGS_MAINT_APPEND="-Wp,-D_FORTIFY_SOURCE=2 -fPIC" dpkg-buildflags --get CFLAGS)" \

0 commit comments

Comments
 (0)