Skip to content

Commit db442f1

Browse files
defanatordefanator
committed
Merged with the default branch.
2 parents a1d2ced + 13c0025 commit db442f1

Some content is hidden

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

85 files changed

+2919
-862
lines changed

‎.hgtags

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,4 @@ e3f504b6082ee97ed0d6c8660890585ef6a5796f 1.21.0-1
5555
ad6aad2450c256d4f1a3c32f7091a78dbbc4a6d1 1.23.0-1
5656
847c88d10f26765b45149c14f88c2274adfc3f42 1.24.0
5757
5c7ce0da580ef6e83c729dd012e976f22acbac27 1.24.0-1
58+
54ffe5ce4fb3c4304faf6d342d9b17dee2c745ac 1.25.0

‎CHANGES

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

2+
Changes with Unit 1.25.0 19 Aug 2021
3+
4+
*) Feature: client IP address replacement from a specified HTTP header
5+
field.
6+
7+
*) Feature: TLS sessions cache.
8+
9+
*) Feature: TLS session tickets.
10+
11+
*) Feature: application restart control.
12+
13+
*) Feature: process and thread lifecycle hooks in Ruby.
14+
15+
*) Bugfix: the router process could crash on TLS connection open when
16+
multiple listeners with TLS certificates were configured; the bug had
17+
appeared in 1.23.0.
18+
19+
*) Bugfix: TLS connections were rejected for configurations with
20+
multiple certificate bundles in a listener if the client did not use
21+
SNI.
22+
23+
*) Bugfix: the router process could crash with frequent mutithreaded
24+
application reconfiguration.
25+
26+
*) Bugfix: compatibility issues with some Python ASGI apps, notably
27+
based on the Starlette framework.
28+
29+
*) Bugfix: a descriptor and memory leak occurred in the router process
30+
when an app process stopped or crashed.
31+
32+
*) Bugfix: the controller or router process could crash if the
33+
configuration contained a full-form IPv6 in a listener address.
34+
35+
*) Bugfix: the router process crashed when a request was passed to an
36+
empty "routes" or "upstreams" using a variable "pass" option.
37+
38+
*) Bugfix: the router process crashed while matching a request to an
39+
empty array of source or destination address patterns.
40+
41+
242
Changes with Unit 1.24.0 27 May 2021
343

444
*) Change: PHP added to the default MIME type list.

‎auto/modules/java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ cat << END > $NXT_JAVA_JARS
238238
static const char *nxt_java_system_jars[] = {
239239
END
240240

241-
NXT_TOMCAT_VERSION=9.0.44
241+
NXT_TOMCAT_VERSION=9.0.52
242242

243243
NXT_JAR_VERSION=$NXT_TOMCAT_VERSION
244244

@@ -271,7 +271,7 @@ NXT_JAR_NAME=tomcat-util
271271
. auto/modules/java_get_jar
272272

273273
NXT_JAR_NAME=ecj
274-
NXT_JAR_VERSION=3.25.0
274+
NXT_JAR_VERSION=3.26.0
275275
NXT_JAR_NAMESPACE=org/eclipse/jdt/
276276
. auto/modules/java_get_jar
277277

@@ -284,7 +284,7 @@ static const char *nxt_java_unit_jars[] = {
284284
"$NXT_UNIT_JAR",
285285
END
286286

287-
NXT_JAR_VERSION=9.4.38.v20210224
287+
NXT_JAR_VERSION=9.4.43.v20210629
288288
NXT_JAR_NAMESPACE=org/eclipse/jetty/
289289

290290
NXT_JAR_NAME=jetty-util
@@ -297,7 +297,7 @@ NXT_JAR_NAME=jetty-http
297297
. auto/modules/java_get_jar
298298

299299
NXT_JAR_NAME=classgraph
300-
NXT_JAR_VERSION=4.8.102
300+
NXT_JAR_VERSION=4.8.112
301301
NXT_JAR_NAMESPACE=io/github/classgraph/
302302
. auto/modules/java_get_jar
303303

‎auto/modules/java_jar.sha512

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
5105e9edf0fc6a4a51eb2bb1e2c23bb78a604fe2df3b1e814cf638ce22845a6ae57e75af31db9dd00d5c650403e751659cca8d3bc465fb96525c695188d2055f classgraph-4.8.102.jar
2-
48cee25d195a5c713a962b035ecba633797753474f290c107a0ee96272cd9ae1b6b62b060ef37e0699f6a5af4d4b45e514ef710309f41bdd9440925cf60a111a ecj-3.25.0.jar
3-
3f2a4a5b7f71c6a1317cec29ea12eb04eac68f4cee94c30ffb75fdd36dbc9c622059fb762e27f74f7b7a38eb84966732ba963cc294f5aaf8b7f5f8c9d60c8899 jetty-http-9.4.38.v20210224.jar
4-
cc416b324841e9c259538a3ec678a9d8e07d3bea9b0bb687bc15a759c5065c7de6ea7bbbb15b369b8c6d2023c3294906d8f9cfda28e1b7859283008790581a4d jetty-server-9.4.38.v20210224.jar
5-
efdbeae97c959459c10b05aae62189c535a0935dadf7debf4257257c31a98a4167ca1318daa81dae32161f51117b17468d5fb5a6bb4eea40864ce1265623d684 jetty-util-9.4.38.v20210224.jar
6-
f2534f246c0cec9be576f18d67759b5a997074bb7870cbf7b9469f062ddc6932e5cec45fd439a5beacc8c6248d39dc458af81245a6eb988e294667f2bcd251df tomcat-api-9.0.44.jar
7-
0c8050b04b02a6a1f1384d1a4041594c09868cfeb139978274c5e5797eb95e0668495f489eb61cfe742905e453184edc0ad8a9fd3b2796e960981a20ae4a0334 tomcat-el-api-9.0.44.jar
8-
cc81a06795553f06d3dfe930429fdf47a8e0c1813c554b640d98090cc661c1eb27a91b9a9055bd14d918fc9451073632a635741dd413fd7b4a380d8907862e14 tomcat-jasper-9.0.44.jar
9-
de50107ff31b8c5a7eb97fe86c2fdfa38305be632c8d62329219884dfb6bbe76372b40a67e808263a55b510a41cde639d55e7925d89db06472392519f0410063 tomcat-jasper-el-9.0.44.jar
10-
69a79e58cea950b713f26a94e1db90221c297375a338f010d1332027ef5d93fd262163ec787b06d8cd41a4a31faa81bb4fc83836148eb14a6757591f6fe5f3c6 tomcat-jsp-api-9.0.44.jar
11-
ca036312596dbd92ae43dda79a9a5ad168cf90a12369636fdc6febbedb559b83d5fa22d77629659b588d70990f8a077fd8356be1c56b0227e07688b67dd7c76e tomcat-juli-9.0.44.jar
12-
952c122413805de16de603cfc233785e53b558b39f146b6fa4e11324e26572e4aee76fec2ee69adecc8f4271cd28acb917e1a9e61a908710b3582ab1f76c9706 tomcat-servlet-api-9.0.44.jar
13-
6920bfb2b1ae173d716fedbf4f238003f569a161f277a888c2d53dac0af80ef0480c9ca3be0ede4583716c1b97c1cfa1665439d14274b7d73ec948fd9f952b89 tomcat-util-9.0.44.jar
14-
915304750cbdffc4c9926fcb22eb928d2895cccd8b3f6f13aefb4e5302cccf5f513502b70812630026dd2968712c4c3b1cfe98d37ecf7b349988e7255ddc5b18 tomcat-util-scan-9.0.44.jar
1+
e7ad5ee436f6befaddcdd1046022a2e30444a435d9419a33f8316f66e794cf710809dbcf7e408a087f434cd9cb724682965b5e4098e34803569241eb44288322 classgraph-4.8.112.jar
2+
ab441acf5551a7dc81c353eaccb3b3df9e89a48987294d19e39acdb83a5b640fcdff7414cee29f5b96eaa8826647f1d5323e185018fe33a64c402d69c73c9158 ecj-3.26.0.jar
3+
a3ce1a5a41c9791ece4cbbf049ec4add1ec41330743d6757daea520f8b329299f5dd274f9e5741ba41fe49510f203efd19540d2404390eca53421132f5f46d4b jetty-http-9.4.43.v20210629.jar
4+
61a14e97baac9962bd68ece24f8b967eec8e32edfebfa27c6a13996a86650d82f8977bf1aa582fc9706a1b028cb3cec0057c97628235dfc130061939845229e6 jetty-server-9.4.43.v20210629.jar
5+
304fcdba2bdbf37e8f2ea69a3f5fbdffdfefd98d80fa78883b1dca1129a4907cef63eb2fa7c83eef359022a3b6a2f3ff742d8d23075c83d049ac01f1402e97f8 jetty-util-9.4.43.v20210629.jar
6+
f14ac948559c0b6e20f6d84e5177fea46ea1321a7a401f280ee9323f3a07e70e141d2b12c8c466c446efb55a58743af931b0584f56494f17311cab511bcd214a tomcat-api-9.0.52.jar
7+
a5ca293732267854a296ccc79b25051acf76fa8dea6118d43aa2e95b6d1951dfaffb941430b5080d7ab62d82d2c82c9385baf99e3c4a2bb6bf4a04372149169d tomcat-el-api-9.0.52.jar
8+
8660e11dd0f994de43b19ba251a789dc3194a6b82d674085fed510200c789b402b27ab97bcecfec0720f563bb0dd18c2631cd8bb5c35e604c1460d7357492123 tomcat-jasper-9.0.52.jar
9+
5b0b3e0edb47e3c4269736542d66d6fc099a74965fdcd5d3a6382db3f75bec7329e81f0719aaafccd318a058ec8fbba113a6ae9234ca94a00c8c39e5c8885568 tomcat-jasper-el-9.0.52.jar
10+
a4368d1073d79a4f8a1cb8967a5e39af87723a17b2d94466554e8e4d3e8bb2dec3ee37db9f606e0c775dd4028604d4e87921f0dda764c8ef138aa50acf03d549 tomcat-jsp-api-9.0.52.jar
11+
8687e108489996226a83e8310c73a2a176fac9ce365a7bd3fc23955fe968c3858a24c047cb5c7fbd1f3a890c893dcdf55e88180eefe61b98c1a3bf4e316fb07e tomcat-juli-9.0.52.jar
12+
f9929f433e2b2f93897a87d117af2519e44020b44e3a475dfc81662b08d08e010b14a3dd6df2d4800196cdba7cbb8db2b879341c5a0ef1d11e5abe63d872bc34 tomcat-servlet-api-9.0.52.jar
13+
c21ccf969378f2cad0ead32451c2527ea944207b5a894b642ee554042fe87eb0ce647aacbf8a51d12b4ecf2bf13e9380da78d8f7792486909daba72e8d0f83f2 tomcat-util-9.0.52.jar
14+
14b4eb31c124d22c7ea7f05808cd6a46076f9d72648afd76e2d11924874117266771a455686d704225d2eff94656f024293140a3259b108857fa6b8b218ddd63 tomcat-util-scan-9.0.52.jar

‎auto/ssltls

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,23 @@ if [ $NXT_OPENSSL = YES ]; then
6666
return 0;
6767
}"
6868
. auto/feature
69+
70+
71+
nxt_feature="OpenSSL tlsext support"
72+
nxt_feature_name=NXT_HAVE_OPENSSL_TLSEXT
73+
nxt_feature_run=
74+
nxt_feature_incs=
75+
nxt_feature_libs="$NXT_OPENSSL_LIBS"
76+
nxt_feature_test="#include <openssl/ssl.h>
77+
78+
int main() {
79+
#if (OPENSSL_NO_TLSEXT)
80+
#error OpenSSL: no tlsext support.
81+
#else
82+
return 0;
83+
#endif
84+
}"
85+
. auto/feature
6986
fi
7087

7188

‎docs/changes.xml

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,121 @@
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
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"
17+
ver="1.25.0" rev="1"
18+
date="2021-08-19" time="18:00:00 +0300"
19+
packager="Andrei Belov &lt;[email protected]&gt;">
20+
21+
<change>
22+
<para>
23+
NGINX Unit updated to 1.25.0.
24+
</para>
25+
</change>
26+
27+
</changes>
28+
29+
30+
<changes apply="unit" ver="1.25.0" rev="1"
31+
date="2021-08-19" time="18:00:00 +0300"
32+
packager="Andrei Belov &lt;[email protected]&gt;">
33+
34+
<change type="feature">
35+
<para>
36+
client IP address replacement from a specified HTTP header field.
37+
</para>
38+
</change>
39+
40+
<change type="feature">
41+
<para>
42+
TLS sessions cache.
43+
</para>
44+
</change>
45+
46+
<change type="feature">
47+
<para>
48+
TLS session tickets.
49+
</para>
50+
</change>
51+
52+
<change type="feature">
53+
<para>
54+
application restart control.
55+
</para>
56+
</change>
57+
58+
<change type="feature">
59+
<para>
60+
process and thread lifecycle hooks in Ruby.
61+
</para>
62+
</change>
63+
64+
<change type="bugfix">
65+
<para>
66+
the router process could crash on TLS connection open when multiple listeners
67+
with TLS certificates were configured; the bug had appeared in 1.23.0.
68+
</para>
69+
</change>
70+
71+
<change type="bugfix">
72+
<para>
73+
TLS connections were rejected for configurations with multiple certificate
74+
bundles in a listener if the client did not use SNI.
75+
</para>
76+
</change>
77+
78+
<change type="bugfix">
79+
<para>
80+
the router process could crash with frequent mutithreaded application
81+
reconfiguration.
82+
</para>
83+
</change>
84+
85+
<change type="bugfix">
86+
<para>
87+
compatibility issues with some Python ASGI apps, notably based on the Starlette
88+
framework.
89+
</para>
90+
</change>
91+
92+
<change type="bugfix">
93+
<para>
94+
a descriptor and memory leak occurred in the router process when an app process
95+
stopped or crashed.
96+
</para>
97+
</change>
98+
99+
<change type="bugfix">
100+
<para>
101+
the controller or router process could crash if the configuration contained
102+
a full-form IPv6 in a listener address.
103+
</para>
104+
</change>
105+
106+
<change type="bugfix">
107+
<para>
108+
the router process crashed when a request was passed to an empty "routes"
109+
or "upstreams" using a variable "pass" option.
110+
</para>
111+
</change>
112+
113+
<change type="bugfix">
114+
<para>
115+
the router process crashed while matching a request to an empty array of source
116+
or destination address patterns.
117+
</para>
118+
</change>
119+
120+
</changes>
121+
122+
8123
<changes apply="unit-jsc17" ver="1.24.0" rev="1"
9124
date="2021-05-27" time="18:00:00 +0300"
10125
packager="Andrei Belov &lt;[email protected]&gt;">

‎pkg/deb/Makefile

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,18 @@ include Makefile.python
135135
include Makefile.perl
136136
endif
137137

138+
# Debian 11
139+
ifeq ($(CODENAME),bullseye)
140+
include Makefile.php
141+
include Makefile.python27
142+
include Makefile.python39
143+
include Makefile.go
144+
include Makefile.perl
145+
include Makefile.ruby
146+
include Makefile.jsc-common
147+
include Makefile.jsc11
148+
endif
149+
138150
# Debian 10
139151
ifeq ($(CODENAME),buster)
140152
include Makefile.php

‎pkg/deb/Makefile.jsc-common

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ MODULE_SUMMARY_jsc_common= Java shared packages for NGINX Unit
66
MODULE_VERSION_jsc_common= $(VERSION)
77
MODULE_RELEASE_jsc_common= 1
88

9-
ifneq (,$(findstring $(CODENAME),hirsute groovy focal eoan disco buster))
9+
ifneq (,$(findstring $(CODENAME),hirsute groovy focal eoan disco buster bullseye))
1010
JAVA_MINVERSION= 11
1111
else
1212
JAVA_MINVERSION= 8

‎pkg/docker/Dockerfile.go1.15

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.24.0 \
11+
&& hg up 1.25.0 \
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)" \

‎pkg/docker/Dockerfile.jsc11

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