diff options
| author | Sergey Kandaurov <pluknet@nginx.com> | 2023-01-02 17:10:22 +0400 |
|---|---|---|
| committer | Sergey Kandaurov <pluknet@nginx.com> | 2023-01-02 17:10:22 +0400 |
| commit | f5aa66bd309a4cbec67285770c77db5d33347c27 (patch) | |
| tree | 33899e3a8bbc6f2196b4afbaa9999c3ff814d4dc /src/core | |
| parent | a1bb12e14ee86fdac2877c3a834b604f5bc522ae (diff) | |
| parent | 9c7a2c7ce4ad02a36df1bb0ee5e40a84610fffb9 (diff) | |
| download | nginx-f5aa66bd309a4cbec67285770c77db5d33347c27.tar.gz nginx-f5aa66bd309a4cbec67285770c77db5d33347c27.zip | |
Merged with the default branch.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/nginx.h | 4 | ||||
| -rw-r--r-- | src/core/ngx_conf_file.c | 4 | ||||
| -rw-r--r-- | src/core/ngx_connection.c | 2 |
3 files changed, 5 insertions, 5 deletions
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 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; } diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c index cbd5803be..57c5a8aa1 100644 --- a/src/core/ngx_connection.c +++ b/src/core/ngx_connection.c @@ -656,7 +656,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) { |