update nginx to v1.22.0

webcpp · Jun 11, 2022 · 17da8c3 · 17da8c3
1 parent b380df4
commit 17da8c3
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/CHANGES b/CHANGES
@@ -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/CHANGES.ru b/CHANGES.ru
@@ -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/LICENSE b/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

diff --git a/auto/options b/auto/options
@@ -406,8 +406,7 @@ $0: warning: the \"--with-sha1-asm\" option is deprecated"
         --test-build-eventport)          NGX_TEST_BUILD_EVENTPORT=YES ;;
         --test-build-epoll)              NGX_TEST_BUILD_EPOLL=YES   ;;
         --test-build-solaris-sendfilev)  NGX_TEST_BUILD_SOLARIS_SENDFILEV=YES ;;
-        --with-http-hi-python-version=*)        HTTP_HI_PYTHON_VERSION="$value";;
-        --with-http-hi-lua-version=*)           HTTP_HI_LUA_VERSION="$value";;
+
         *)
             echo "$0: error: invalid option \"$option\""
             exit 1

diff --git 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