automatic import of nginxopeneuler23.09

4 files changed, 9 insertions, 79 deletions

diff --git a/.gitignore b/.gitignore
index 385f11b..653f450 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /nginx-1.24.0.tar.gz
 /nginx-logo.png
 /nginx-1.26.0.tar.gz
+/nginx-1.26.1.tar.gz
diff --git a/backport-CVE-2023-44487.patch b/backport-CVE-2023-44487.patch
deleted file mode 100644
index 4731cee..0000000
--- a/backport-CVE-2023-44487.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 6ceef192e7af1c507826ac38a2d43f08bf265fb9 Mon Sep 17 00:00:00 2001
-From: Maxim Dounin <mdounin@mdounin.ru>
-Date: Tue, 10 Oct 2023 15:13:39 +0300
-Subject: [PATCH] HTTP/2: per-iteration stream handling limit.
-
-To ensure that attempts to flood servers with many streams are detected
-early, a limit of no more than 2 * max_concurrent_streams new streams per one
-event loop iteration was introduced.  This limit is applied even if
-max_concurrent_streams is not yet reached - for example, if corresponding
-streams are handled synchronously or reset.
-
-Further, refused streams are now limited to maximum of max_concurrent_streams
-and 100, similarly to priority_limit initial value, providing some tolerance
-to clients trying to open several streams at the connection start, yet
-low tolerance to flooding attempts.
-
-Conflict: context adapt
-Reference: https://github.com/nginx/nginx/commit/6ceef192e7af1c507826ac38a2d43f08bf265fb9
----
- src/http/v2/ngx_http_v2.c | 15 +++++++++++++++
- src/http/v2/ngx_http_v2.h |  2 ++
- 2 files changed, 17 insertions(+)
-
-diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c
-index 7c05ff1e78..410a8be24e 100644
---- a/src/http/v2/ngx_http_v2.c
-+++ b/src/http/v2/ngx_http_v2.c
-@@ -347,6 +347,7 @@ ngx_http_v2_read_handler(ngx_event_t *rev)
-     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http2 read handler");
- 
-     h2c->blocked = 1;
-+    h2c->new_streams = 0;
- 
-     if (c->close) {
-         c->close = 0;
-@@ -1284,6 +1285,14 @@ ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos,
-         goto rst_stream;
-     }
- 
-+    if (h2c->new_streams++ >= 2 * h2scf->concurrent_streams) {
-+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
-+                      "client sent too many streams at once");
-+
-+        status = NGX_HTTP_V2_REFUSED_STREAM;
-+        goto rst_stream;
-+    }
-+
-     if (!h2c->settings_ack
-         && !(h2c->state.flags & NGX_HTTP_V2_END_STREAM_FLAG)
-         && h2scf->preread_size < NGX_HTTP_V2_DEFAULT_WINDOW)
-@@ -1349,6 +1358,12 @@ ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos,
- 
- rst_stream:
- 
-+    if (h2c->refused_streams++ > ngx_max(h2scf->concurrent_streams, 100)) {
-+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
-+                      "client sent too many refused streams");
-+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_NO_ERROR);
-+    }
-+
-     if (ngx_http_v2_send_rst_stream(h2c, h2c->state.sid, status) != NGX_OK) {
-         return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_INTERNAL_ERROR);
-     }
-diff --git a/src/http/v2/ngx_http_v2.h b/src/http/v2/ngx_http_v2.h
-index cb9014ccfb..6751b3026d 100644
---- a/src/http/v2/ngx_http_v2.h
-+++ b/src/http/v2/ngx_http_v2.h
-@@ -131,6 +131,8 @@ struct ngx_http_v2_connection_s {
-     ngx_uint_t                       processing;
-     ngx_uint_t                       frames;
-     ngx_uint_t                       idle;
-+    ngx_uint_t                       new_streams;
-+    ngx_uint_t                       refused_streams;
-     ngx_uint_t                       priority_limit;
- 
-     ngx_uint_t                       pushing;
diff --git a/nginx.spec b/nginx.spec
index 9cacee3..624319e 100644
--- a/nginx.spec
+++ b/nginx.spec
@@ -16,7 +16,7 @@
 
 Name:              nginx
 Epoch:             1
-Version:           1.24.0
+Version:           1.26.1
 Release:           1
 Summary:           A HTTP server, reverse proxy and mail proxy server
 License:           BSD
@@ -39,7 +39,6 @@ Source210:         UPGRADE-NOTES-1.6-to-1.10
 Patch0:            nginx-auto-cc-gcc.patch
 Patch1:            nginx-1.12.1-logs-perm.patch
 Patch2:            nginx-fix-pidfile.patch
-Patch3:            backport-CVE-2023-44487.patch
 
 BuildRequires:     gcc openssl-devel pcre2-devel zlib-devel systemd gperftools-devel
 Requires:          nginx-filesystem = %{epoch}:%{version}-%{release} openssl
@@ -387,6 +386,12 @@ fi
 %{_mandir}/man8/nginx.8*
 
 %changelog
+* Fri May 31 2024 Funda Wang <fundawang@yeah.net> - 1:1.26.1-1
+- 1.26.1
+
+* Wed Apr 24 2024 Funda Wang <fundawang@yeah.net> - 1:1.26.0-1
+- 1.26.0
+
 * Tue Jan 02 2024 gaihuiying <eaglegai@163.com> - 1:1.24.0-1
 - update nginx to 1.24.0
 
diff --git a/sources b/sources
index 833d1ba..eaf08f2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-f95835b55b3cbf05a4368e7bccbb8a46  nginx-1.24.0.tar.gz
+56b83c172c7f2fd09d59123bc28ff2b1  nginx-1.26.1.tar.gz
 425a3bef572ffa7e706bd7db8452c733  nginx-logo.png