Hello!
Below are patches for the freenginx-1.26.0 release, and
corresponding changes to the site. Comments are welcome.
# HG changeset patch
# User Maxim Dounin <mdou...@mdounin.ru>
# Date 1712621110 -10800
# Tue Apr 09 03:05:10 2024 +0300
# Branch stable-1.26
# Node ID 4bf1593032eb5fd4af2475d84cb95b638ccadc5d
# Parent ccd7e4022a2498a930c9e0927a9820f7ea17ae13
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 1025005
-#define NGINX_VERSION "1.25.5"
+#define nginx_version 1026000
+#define NGINX_VERSION "1.26.0"
#define NGINX_NAME "freenginx"
#define NGINX_VER NGINX_NAME "/" NGINX_VERSION
# HG changeset patch
# User Maxim Dounin <mdou...@mdounin.ru>
# Date 1712621234 -10800
# Tue Apr 09 03:07:14 2024 +0300
# Branch stable-1.26
# Node ID d68e71aa551d87a1dda3173134169376aa786bcb
# Parent 4bf1593032eb5fd4af2475d84cb95b638ccadc5d
freenginx-1.26.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
@@ -7,6 +7,20 @@
<section title="freenginx">
+<changes ver="1.26.0" date="2024-04-09">
+
+<change>
+<para lang="ru">
+Стабильная ветка 1.26.x.
+</para>
+<para lang="en">
+1.26.x stable branch.
+</para>
+</change>
+
+</changes>
+
+
<changes ver="1.25.5" date="2024-04-02">
<change type="change">
# HG changeset patch
# User Maxim Dounin <mdou...@mdounin.ru>
# Date 1712621235 -10800
# Tue Apr 09 03:07:15 2024 +0300
# Branch stable-1.26
# Node ID acb6b8f4bfd884df9831f94beacc256742d1bd19
# Parent d68e71aa551d87a1dda3173134169376aa786bcb
release-1.26.0 tag
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -478,3 +478,4 @@ 1d839f05409d1a50d0f15a2bf36547001f99ae40
294a3d07234f8f65d7b0e0b0e2c5b05c12c5da0a release-1.25.3
ab948bfa042d7a7b20c3e730d7e9675cc172324f release-1.25.4
2956b59565c91baa79d13d6411f2404614c0134e release-1.25.5
+d68e71aa551d87a1dda3173134169376aa786bcb release-1.26.0
# HG changeset patch
# User Maxim Dounin <mdou...@mdounin.ru>
# Date 1712621506 -10800
# Tue Apr 09 03:11:46 2024 +0300
# Node ID 036ded8db5dffc2419872d250f09428e40a0fc30
# Parent 619538194516298f17b2ec7fff283c8607394b96
freenginx-1.26.0
diff --git a/text/en/CHANGES b/text/en/CHANGES-1.26
copy from text/en/CHANGES
copy to text/en/CHANGES-1.26
--- a/text/en/CHANGES
+++ b/text/en/CHANGES-1.26
@@ -1,4 +1,9 @@
+Changes with freenginx 1.26.0 09 Apr 2024
+
+ *) 1.26.x stable branch.
+
+
Changes with freenginx 1.25.5 02 Apr 2024
*) Change: MIME type for the "bmp" extension has been changed to
diff --git a/text/ru/CHANGES.ru b/text/ru/CHANGES.ru-1.26
copy from text/ru/CHANGES.ru
copy to text/ru/CHANGES.ru-1.26
--- a/text/ru/CHANGES.ru
+++ b/text/ru/CHANGES.ru-1.26
@@ -1,4 +1,9 @@
+Изменения в freenginx 1.26.0 09.04.2024
+
+ *) Стабильная ветка 1.26.x.
+
+
Изменения в freenginx 1.25.5 02.04.2024
*) Изменение: MIME-тип для расширения bmp изменён на "image/bmp", для
diff --git a/xml/en/download.xml b/xml/en/download.xml
--- a/xml/en/download.xml
+++ b/xml/en/download.xml
@@ -8,7 +8,7 @@
<article name="nginx: download"
link="/en/download.html"
lang="en"
- rev="5">
+ rev="6">
<section name="Mainline version">
@@ -17,6 +17,14 @@
</section>
+
+<section name="Stable version">
+
+<download last="1" tag="stable" />
+
+</section>
+
+
<section name="Source Code">
<para>
diff --git a/xml/index.xml b/xml/index.xml
--- a/xml/index.xml
+++ b/xml/index.xml
@@ -8,6 +8,20 @@
<news name="nginx news" link="/" lang="en">
+<event date="2024-04-09">
+<para>
+<link doc="en/download.xml">freenginx-1.26.0</link>
+stable version has been released,
+incorporating new features and bug fixes from the 1.25.x mainline branch
—
+including
+experimental
+<link doc="en/docs/http/ngx_http_v3_module.xml">HTTP/3 support</link>,
+improved mitigation of various DoS attacks,
+fixes in AIO handling,
+and more.
+</para>
+</event>
+
<event date="2024-04-02">
<para>
<link doc="en/download.xml">freenginx-1.25.5</link>
diff --git a/xml/ru/download.xml b/xml/ru/download.xml
--- a/xml/ru/download.xml
+++ b/xml/ru/download.xml
@@ -8,7 +8,7 @@
<article name="nginx: скачать"
link="/ru/download.html"
lang="ru"
- rev="5">
+ rev="6">
<section name="Основная версия">
@@ -18,6 +18,13 @@
</section>
+<section name="Стабильная версия">
+
+<download last="1" tag="stable" />
+
+</section>
+
+
<section name="Исходный код">
<para>
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.25.5" name="freenginx" />
+
+</download>
+
+
+<download tag="stable" changes="1.26">
+
+<item ver="1.26.0" name="freenginx" />
+<item ver="1.25.5" name="freenginx" />
<item ver="1.25.4" name="freenginx" />
<item ver="1.25.3" />
<item ver="1.25.2" />
@@ -19,7 +27,7 @@
</download>
-<download tag="stable" changes="1.24">
+<download tag="legacy" changes="1.24">
<item ver="1.24.0" />
<item ver="1.23.4" />
--
Maxim Dounin
http://mdounin.ru/
--
nginx-devel mailing list
nginx-devel@freenginx.org
https://freenginx.org/mailman/listinfo/nginx-devel
