From bf5dcc3fb23d9ab488236cb08418e58ff881c598 Mon Sep 17 00:00:00 2001
From: Sergey Kandaurov <pluknet@nginx.com>
Date: Fri, 16 Dec 2022 01:15:13 +0400
Subject: Version bump.

---
 src/core/nginx.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/core')

diff --git a/src/core/nginx.h b/src/core/nginx.h
index f4e9d7c91..f26c6181a 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1023003
-#define NGINX_VERSION      "1.23.3"
+#define nginx_version      1023004
+#define NGINX_VERSION      "1.23.4"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
-- 
cgit 


From 95133893f9821fd08619d5d2af71ea2c3345f095 Mon Sep 17 00:00:00 2001
From: BullerDu <yefei.dyf@alibaba-inc.com>
Date: Fri, 16 Dec 2022 01:15:15 +0400
Subject: Style.

---
 src/core/ngx_conf_file.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/core')

diff --git a/src/core/ngx_conf_file.c b/src/core/ngx_conf_file.c
index fec7bb83a..197704b0f 100644
--- a/src/core/ngx_conf_file.c
+++ b/src/core/ngx_conf_file.c
@@ -544,8 +544,8 @@ ngx_conf_read_token(ngx_conf_t *cf)
                     }
 
                     ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                                  "unexpected end of file, "
-                                  "expecting \";\" or \"}\"");
+                                       "unexpected end of file, "
+                                       "expecting \";\" or \"}\"");
                     return NGX_ERROR;
                 }
 
-- 
cgit 


From 9c7a2c7ce4ad02a36df1bb0ee5e40a84610fffb9 Mon Sep 17 00:00:00 2001
From: Maxim Dounin <mdounin@mdounin.ru>
Date: Wed, 21 Dec 2022 14:53:27 +0300
Subject: Updated link to OpenVZ suspend/resume bug.

---
 src/core/ngx_connection.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/core')

diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c
index fe729a78a..36823451a 100644
--- a/src/core/ngx_connection.c
+++ b/src/core/ngx_connection.c
@@ -660,7 +660,7 @@ ngx_open_listening_sockets(ngx_cycle_t *cycle)
                 /*
                  * on OpenVZ after suspend/resume EADDRINUSE
                  * may be returned by listen() instead of bind(), see
-                 * https://bugzilla.openvz.org/show_bug.cgi?id=2470
+                 * https://bugs.openvz.org/browse/OVZ-5587
                  */
 
                 if (err != NGX_EADDRINUSE || !ngx_test_config) {
-- 
cgit