Hello!
Below are patches for the nginx-1.22.0 release, and corresponding
changes to the site.
The nginx-1.22.0 release is based on nginx-1.21.6 with two
additional changes grafted from the default branch: copyright year
update and OpenSSL/zlib for win32 builds update.
(Note that applying these patches requires importing the second
patch with "hg import --exact", to make sure it will use correct
parent changeset and will use branch information. Importing all
patches with "--exact" will, however, fail, as export does not
preserve graft information, and "--exact" will notice this.)
Comments are welcome.
# HG changeset patch
# User Maxim Dounin <mdou...@mdounin.ru>
# Date 1653349909 -10800
# Tue May 24 02:51:49 2022 +0300
# Node ID 8a54733c9d1290e6dc2f86af18e8a976a6352e4f
# Parent 35afae4b3dffff6718c0cab3ceb16b9de207c20a
Updated OpenSSL and zlib used for win32 builds.
diff --git a/misc/GNUmakefile b/misc/GNUmakefile
--- a/misc/GNUmakefile
+++ b/misc/GNUmakefile
@@ -6,8 +6,8 @@ TEMP = tmp
CC = cl
OBJS = objs.msvc8
-OPENSSL = openssl-1.1.1m
-ZLIB = zlib-1.2.11
+OPENSSL = openssl-1.1.1o
+ZLIB = zlib-1.2.12
PCRE = pcre2-10.39
# HG changeset patch
# User Maxim Dounin <mdou...@mdounin.ru>
# Date 1653350129 -10800
# Tue May 24 02:55:29 2022 +0300
# Branch stable-1.22
# Node ID c32b775633d37dffc3cfe4330549a85f21b47e3d
# Parent 56ead48cfe885e8b89b30017459bf621b21d95f5
Stable branch.
diff --git a/src/core/nginx.h b/src/core/nginx.h
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
#define _NGINX_H_INCLUDED_
-#define nginx_version 1021006
-#define NGINX_VERSION "1.21.6"
+#define nginx_version 1022000
+#define NGINX_VERSION "1.22.0"
#define NGINX_VER "nginx/" NGINX_VERSION
#ifdef NGX_BUILD
# HG changeset patch
# User Sergey Kandaurov <pluk...@nginx.com>
# Date 1643970571 -10800
# Fri Feb 04 13:29:31 2022 +0300
# Branch stable-1.22
# Node ID dbf18f45a2b627944f79ec2e96859c7b6367d769
# Parent c32b775633d37dffc3cfe4330549a85f21b47e3d
Year 2022.
diff --git a/docs/text/LICENSE b/docs/text/LICENSE
--- a/docs/text/LICENSE
+++ b/docs/text/LICENSE
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2002-2021 Igor Sysoev
- * Copyright (C) 2011-2021 Nginx, Inc.
+ * Copyright (C) 2011-2022 Nginx, Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
# HG changeset patch
# User Maxim Dounin <mdou...@mdounin.ru>
# Date 1653349909 -10800
# Tue May 24 02:51:49 2022 +0300
# Branch stable-1.22
# Node ID adbfc4fb948c0f3043fdce2c52689293b96a6a65
# Parent dbf18f45a2b627944f79ec2e96859c7b6367d769
Updated OpenSSL and zlib used for win32 builds.
diff --git a/misc/GNUmakefile b/misc/GNUmakefile
--- a/misc/GNUmakefile
+++ b/misc/GNUmakefile
@@ -6,8 +6,8 @@ TEMP = tmp
CC = cl
OBJS = objs.msvc8
-OPENSSL = openssl-1.1.1m
-ZLIB = zlib-1.2.11
+OPENSSL = openssl-1.1.1o
+ZLIB = zlib-1.2.12
PCRE = pcre2-10.39
# HG changeset patch
# User Maxim Dounin <mdou...@mdounin.ru>
# Date 1653350358 -10800
# Tue May 24 02:59:18 2022 +0300
# Branch stable-1.22
# Node ID f669c9c2a617d80daf753e012265ab5290df0d9b
# Parent adbfc4fb948c0f3043fdce2c52689293b96a6a65
nginx-1.22.0-RELEASE
diff --git a/docs/xml/nginx/changes.xml b/docs/xml/nginx/changes.xml
--- a/docs/xml/nginx/changes.xml
+++ b/docs/xml/nginx/changes.xml
@@ -5,6 +5,20 @@
<change_log title="nginx">
+<changes ver="1.22.0" date="2022-05-24">
+
+<change>
+<para lang="ru">
+Стабильная ветка 1.22.x.
+</para>
+<para lang="en">
+1.22.x stable branch.
+</para>
+</change>
+
+</changes>
+
+
<changes ver="1.21.6" date="2022-01-25">
<change type="bugfix">
# HG changeset patch
# User Maxim Dounin <mdou...@mdounin.ru>
# Date 1653350359 -10800
# Tue May 24 02:59:19 2022 +0300
# Branch stable-1.22
# Node ID 2d3ed138ce652d5fdb2403d996bdc05c3c638803
# Parent f669c9c2a617d80daf753e012265ab5290df0d9b
release-1.22.0 tag
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -467,3 +467,4 @@ 2217a9c1d0b86026f22700b3c089545db1964f55
39be8a682c58308d9399cddd57e37f9fdb7bdf3e release-1.21.4
d986378168fd4d70e0121cabac274c560cca9bdf release-1.21.5
714eb4b2c09e712fb2572a2164ce2bf67638ccac release-1.21.6
+f669c9c2a617d80daf753e012265ab5290df0d9b release-1.22.0
Site changes:
# HG changeset patch
# User Maxim Dounin <mdou...@mdounin.ru>
# Date 1653359312 -10800
# Tue May 24 05:28:32 2022 +0300
# Node ID 8be8d7f16ce76dfcb8011ac69cd629f03478e321
# Parent 6cd5251fa7600f840ada2dd2a39c2aed6af29a02
nginx-1.22.0
diff --git a/text/en/CHANGES b/text/en/CHANGES-1.22
copy from text/en/CHANGES
copy to text/en/CHANGES-1.22
--- a/text/en/CHANGES
+++ b/text/en/CHANGES-1.22
@@ -1,4 +1,9 @@
+Changes with nginx 1.22.0 24 May 2022
+
+ *) 1.22.x stable branch.
+
+
Changes with nginx 1.21.6 25 Jan 2022
*) Bugfix: when using EPOLLEXCLUSIVE on Linux client connections were
diff --git a/text/ru/CHANGES.ru b/text/ru/CHANGES.ru-1.22
copy from text/ru/CHANGES.ru
copy to text/ru/CHANGES.ru-1.22
--- a/text/ru/CHANGES.ru
+++ b/text/ru/CHANGES.ru-1.22
@@ -1,4 +1,9 @@
+Изменения в nginx 1.22.0 24.05.2022
+
+ *) Стабильная ветка 1.22.x.
+
+
Изменения в nginx 1.21.6 25.01.2022
*) Исправление: при использование EPOLLEXCLUSIVE на Linux распределение
diff --git a/xml/index.xml b/xml/index.xml
--- a/xml/index.xml
+++ b/xml/index.xml
@@ -7,6 +7,29 @@
<news name="nginx news" link="/" lang="en">
+<event date="2021-05-24">
+<para>
+<link doc="en/download.xml">nginx-1.22.0</link>
+stable version has been released,
+incorporating new features and bug fixes from the 1.21.x mainline branch
—
+including
+hardening against potential requests smuggling
+and cross-protocol attacks,
+<link doc="en/docs/stream/ngx_stream_ssl_module.xml" id="ssl_alpn">ALPN
+support</link> in the stream module,
+better distribution of connections among worker processes on Linux,
+support for the PCRE2 library,
+support for OpenSSL 3.0 and <c-func>SSL_sendfile</c-func>,
+improved
+<link doc="en/docs/http/ngx_http_core_module.xml" id="sendfile">sendfile</link>
+handling on FreeBSD,
+the
+<link doc="en/docs/http/ngx_http_mp4_module.xml" id="mp4_start_key_frame">
+mp4_start_key_frame</link> directive,
+and more.
+</para>
+</event>
+
<event date="2022-04-12">
<para>
<link doc="en/docs/njs/index.xml">njs-0.7.3</link>
diff --git a/xml/versions.xml b/xml/versions.xml
--- a/xml/versions.xml
+++ b/xml/versions.xml
@@ -10,6 +10,14 @@
<download tag="mainline" changes="">
<item ver="1.21.6" />
+
+</download>
+
+
+<download tag="stable" changes="1.22">
+
+<item ver="1.22.0" />
+<item ver="1.21.6" />
<item ver="1.21.5" />
<item ver="1.21.4" />
<item ver="1.21.3" />
@@ -20,7 +28,7 @@
</download>
-<download tag="stable" changes="1.20">
+<download tag="legacy" changes="1.20">
<item ver="1.20.2" />
<item ver="1.20.1" />
--
Maxim Dounin
http://mdounin.ru/
_______________________________________________
nginx-devel mailing list -- nginx-devel@nginx.org
To unsubscribe send an email to nginx-devel-le...@nginx.org
