Skip to content

Commit 2cc9537

Browse files
thresheekthresheek
committed
Merged with the 1.29 branch.
2 parents cae4a4e + 0af1253 commit 2cc9537

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+679
-119
lines changed

‎CHANGES

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

2+
Changes with Unit 1.29.1 28 Feb 2023
3+
4+
*) Bugfix: stop creating world-writeable directories.
5+
6+
*) Bugfix: memory leak related to NJS.
7+
8+
*) Bugfix: path parsing in PHP applications.
9+
10+
*) Bugfix: enabled UTF-8 for Python config by default to avoid
11+
applications failing in some cases.
12+
13+
*) Bugfix: using asyncio.get_running_loop() instead of
14+
asyncio.get_event_loop() when it's available to prevent errors in
15+
some Python ASGI applications.
16+
17+
*) Bugfix: applications that make use of various low level APIs such as
18+
pthreads could fail to work correctly.
19+
20+
*) Bugfix: websocket endianness detection for obscure operating systems.
21+
22+
223
Changes with Unit 1.29.0 15 Dec 2022
324

425
*) Change: removed $uri auto-append for "share" when loading

‎auto/endian

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Copyright (C) Igor Sysoev
2+
# Copyright (C) Andrew Clayton
3+
# Copyright (C) Nginx, Inc.
4+
5+
6+
nxt_feature="endianness"
7+
nxt_feature_name=
8+
nxt_feature_run=value
9+
nxt_feature_incs=
10+
nxt_feature_libs=
11+
nxt_feature_test="#include <stdint.h>
12+
#include <stdio.h>
13+
14+
int main(void) {
15+
int i = 0x11223344;
16+
uint8_t *p;
17+
18+
p = (uint8_t *)&i;
19+
if (*p == 0x44)
20+
printf(\"little endian\");
21+
else
22+
printf(\"big endian\");
23+
return 0;
24+
}"
25+
. auto/feature
26+
27+
if [ "$nxt_feature_value" = "little endian" ]; then
28+
nxt_have=NXT_HAVE_LITTLE_ENDIAN . auto/have
29+
else
30+
nxt_have=NXT_HAVE_BIG_ENDIAN . auto/have
31+
fi

‎auto/isolation

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,29 @@
44
# Linux clone syscall.
55

66
NXT_ISOLATION=NO
7-
NXT_HAVE_CLONE=NO
7+
NXT_HAVE_LINUX_NS=NO
88
NXT_HAVE_CLONE_NEWUSER=NO
99
NXT_HAVE_MOUNT=NO
1010
NXT_HAVE_UNMOUNT=NO
1111
NXT_HAVE_ROOTFS=NO
1212

1313
nsflags="USER NS PID NET UTS CGROUP"
1414

15-
nxt_feature="clone(2)"
16-
nxt_feature_name=NXT_HAVE_CLONE
15+
nxt_feature="Linux unshare()"
16+
nxt_feature_name=NXT_HAVE_LINUX_NS
1717
nxt_feature_run=no
1818
nxt_feature_incs=
1919
nxt_feature_libs=
20-
nxt_feature_test="#include <sys/wait.h>
21-
#include <sys/syscall.h>
20+
nxt_feature_test="#define _GNU_SOURCE
21+
#include <sched.h>
2222

2323
int main(void) {
24-
return SYS_clone | SIGCHLD;
24+
return unshare(0);
2525
}"
2626
. auto/feature
2727

2828
if [ $nxt_found = yes ]; then
29-
NXT_HAVE_CLONE=YES
29+
NXT_HAVE_LINUX_NS=YES
3030

3131
# Test all isolation flags
3232
for flag in $nsflags; do
@@ -90,7 +90,7 @@ nxt_feature_test="#include <mntent.h>
9090

9191

9292
nxt_feature="prctl(PR_SET_NO_NEW_PRIVS)"
93-
nxt_feature_name=NXT_HAVE_PR_SET_NO_NEW_PRIVS0
93+
nxt_feature_name=NXT_HAVE_PR_SET_NO_NEW_PRIVS
9494
nxt_feature_run=no
9595
nxt_feature_incs=
9696
nxt_feature_libs=
@@ -102,6 +102,19 @@ nxt_feature_test="#include <sys/prctl.h>
102102
. auto/feature
103103

104104

105+
nxt_feature="prctl(PR_SET_CHILD_SUBREAPER)"
106+
nxt_feature_name=NXT_HAVE_PR_SET_CHILD_SUBREAPER
107+
nxt_feature_run=no
108+
nxt_feature_incs=
109+
nxt_feature_libs=
110+
nxt_feature_test="#include <sys/prctl.h>
111+
112+
int main(void) {
113+
return PR_SET_CHILD_SUBREAPER;
114+
}"
115+
. auto/feature
116+
117+
105118
nxt_feature="Linux mount()"
106119
nxt_feature_name=NXT_HAVE_LINUX_MOUNT
107120
nxt_feature_run=no

‎auto/sources

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ if [ "$NXT_HAVE_HPUX_SENDFILE" = "YES" \
299299
fi
300300

301301

302-
if [ "$NXT_HAVE_CLONE" = "YES" ]; then
302+
if [ "$NXT_HAVE_LINUX_NS" = "YES" ]; then
303303
NXT_LIB_SRCS="$NXT_LIB_SRCS $NXT_LIB_CLONE_SRCS"
304304
fi
305305

‎configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ fi
109109

110110
NXT_LIBRT=
111111

112+
. auto/endian
112113
. auto/types
113114
. auto/clang
114115
. auto/atomic
@@ -136,7 +137,6 @@ fi
136137

137138
case "$NXT_SYSTEM_PLATFORM" in
138139
i386 | amd64 | x86_64)
139-
nxt_have=NXT_HAVE_LITTLE_ENDIAN . auto/have
140140
nxt_have=NXT_HAVE_NONALIGNED . auto/have
141141
;;
142142
esac

‎docs/changes.xml

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,81 @@
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 unit-python3.11
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+
unit-jsc19"
18+
ver="1.29.1" rev="1"
19+
date="2023-02-28" time="18:00:00 +0300"
20+
packager="Nginx Packaging &lt;[email protected]&gt;">
21+
22+
<change>
23+
<para>
24+
NGINX Unit updated to 1.29.1.
25+
</para>
26+
</change>
27+
28+
</changes>
29+
30+
31+
<changes apply="unit" ver="1.29.1" rev="1"
32+
date="2023-02-28" time="18:00:00 +0300"
33+
packager="Nginx Packaging &lt;[email protected]&gt;">
34+
35+
<change type="bugfix">
36+
<para>
37+
stop creating world-writeable directories.
38+
</para>
39+
</change>
40+
41+
<change type="bugfix">
42+
<para>
43+
memory leak related to NJS.
44+
</para>
45+
</change>
46+
47+
<change type="bugfix">
48+
<para>
49+
path parsing in PHP applications.
50+
</para>
51+
</change>
52+
53+
<change type="bugfix">
54+
<para>
55+
enabled UTF-8 for Python config by default to avoid applications failing
56+
in some cases.
57+
</para>
58+
</change>
59+
60+
<change type="bugfix">
61+
<para>
62+
using asyncio.get_running_loop() instead of asyncio.get_event_loop()
63+
when it's available to prevent errors in some Python ASGI applications.
64+
</para>
65+
</change>
66+
67+
<change type="bugfix">
68+
<para>
69+
applications that make use of various low level APIs such as pthreads could
70+
fail to work correctly.
71+
</para>
72+
</change>
73+
74+
<change type="bugfix">
75+
<para>
76+
websocket endianness detection for obscure operating systems.
77+
</para>
78+
</change>
79+
80+
</changes>
81+
82+
883
<changes apply="unit-php
984
unit-python unit-python2.7
1085
unit-python3.4 unit-python3.5 unit-python3.6 unit-python3.7

‎pkg/contrib/src/njs/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ njs: njs-$(NJS_VERSION).tar.gz .sum-njs
1515
$(MOVE)
1616

1717
.njs: njs
18-
cd $< && ./configure && $(MAKE) libnjs
18+
cd $< && ./configure --no-libxml2 && $(MAKE) libnjs
1919
touch $@

‎pkg/contrib/src/njs/SHA512SUMS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
dc73029e7b570a7fbc94e90deb1e17c9a3d85072dc0e060f11dd96bd173e11b7c823c57115369d3c68af7acd97fabe619b70dfd73280694f8b5dc8b7929d850b njs-0.7.9.tar.gz
1+
5063fcfac18298d86157d05dc618f47815763a2192538befa5f046d081a7d5c6b624b65258674a6d9719147c102a703d5c3a80d937f4e9d43985da8e85dbc539 njs-0.7.10.tar.gz

‎pkg/contrib/src/njs/version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
NJS_VERSION := 0.7.9
1+
NJS_VERSION := 0.7.10

‎pkg/docker/Dockerfile.go1.19

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.29.0 \
11+
&& hg up 1.29.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)