feature: bump nginx to 1.28.0

pull/1045/head
耗子 3 days ago
parent 008aec1953
commit 852665bec7
No known key found for this signature in database
GPG Key ID: C964D7226D045DAA

@ -1,36 +0,0 @@
diff -urp nginx-1.27.5/auto/cc/clang nginx-1.27.5-patched/auto/cc/clang
--- nginx-1.27.5/auto/cc/clang 2014-03-04 03:39:24.000000000 -0800
+++ nginx-1.27.5-patched/auto/cc/clang 2014-03-13 20:54:26.241413360 -0700
@@ -89,7 +89,7 @@ CFLAGS="$CFLAGS -Wconditional-uninitiali
CFLAGS="$CFLAGS -Wno-unused-parameter"
# stop on warning
-CFLAGS="$CFLAGS -Werror"
+#CFLAGS="$CFLAGS -Werror"
# debug
CFLAGS="$CFLAGS -g"
diff -urp nginx-1.27.5/auto/cc/gcc nginx-1.27.5-patched/auto/cc/gcc
--- nginx-1.27.5/auto/cc/gcc 2014-03-04 03:39:24.000000000 -0800
+++ nginx-1.27.5-patched/auto/cc/gcc 2014-03-13 20:54:13.301355329 -0700
@@ -168,7 +168,7 @@ esac
# stop on warning
-CFLAGS="$CFLAGS -Werror"
+#CFLAGS="$CFLAGS -Werror"
# debug
CFLAGS="$CFLAGS -g"
diff -urp nginx-1.27.5/auto/cc/icc nginx-1.27.5-patched/auto/cc/icc
--- nginx-1.27.5/auto/cc/icc 2014-03-04 03:39:24.000000000 -0800
+++ nginx-1.27.5-patched/auto/cc/icc 2014-03-13 20:54:13.301355329 -0700
@@ -115,7 +115,7 @@ case "$NGX_ICC_VER" in
esac
# stop on warning
-CFLAGS="$CFLAGS -Werror"
+#CFLAGS="$CFLAGS -Werror"
# debug
CFLAGS="$CFLAGS -g"

@ -1,5 +1,5 @@
--- nginx-1.27.5/auto/cc/conf 2015-10-30 22:47:50.000000000 +0800 --- nginx-1.28.0/auto/cc/conf 2015-10-30 22:47:50.000000000 +0800
+++ nginx-1.27.5-patched/auto/cc/conf 2015-11-02 12:23:05.385156987 +0800 +++ nginx-1.28.0-patched/auto/cc/conf 2015-11-02 12:23:05.385156987 +0800
@@ -144,7 +144,7 @@ fi @@ -144,7 +144,7 @@ fi
CFLAGS="$CFLAGS $NGX_CC_OPT" CFLAGS="$CFLAGS $NGX_CC_OPT"
NGX_TEST_LD_OPT="$NGX_LD_OPT" NGX_TEST_LD_OPT="$NGX_LD_OPT"

@ -1,6 +1,6 @@
diff -rup nginx-1.27.5/src/core/nginx.c nginx-1.27.5-patched/src/core/nginx.c diff -rup nginx-1.28.0/src/core/nginx.c nginx-1.28.0-patched/src/core/nginx.c
--- nginx-1.27.5/src/core/nginx.c 2017-12-17 00:00:38.136470108 -0800 --- nginx-1.28.0/src/core/nginx.c 2017-12-17 00:00:38.136470108 -0800
+++ nginx-1.27.5-patched/src/core/nginx.c 2017-12-16 23:59:51.680958322 -0800 +++ nginx-1.28.0-patched/src/core/nginx.c 2017-12-16 23:59:51.680958322 -0800
@@ -186,6 +186,7 @@ static u_char *ngx_prefix; @@ -186,6 +186,7 @@ static u_char *ngx_prefix;
static u_char *ngx_conf_file; static u_char *ngx_conf_file;
static u_char *ngx_conf_params; static u_char *ngx_conf_params;
@ -18,9 +18,9 @@ diff -rup nginx-1.27.5/src/core/nginx.c nginx-1.27.5-patched/src/core/nginx.c
if (ngx_save_argv(&init_cycle, argc, argv) != NGX_OK) { if (ngx_save_argv(&init_cycle, argc, argv) != NGX_OK) {
return 1; return 1;
} }
diff -rup nginx-1.27.5/src/core/ngx_core.h nginx-1.27.5-patched/src/core/ngx_core.h diff -rup nginx-1.28.0/src/core/ngx_core.h nginx-1.28.0-patched/src/core/ngx_core.h
--- nginx-1.27.5/src/core/ngx_core.h 2017-10-10 08:22:51.000000000 -0700 --- nginx-1.28.0/src/core/ngx_core.h 2017-10-10 08:22:51.000000000 -0700
+++ nginx-1.27.5-patched/src/core/ngx_core.h 2017-12-16 23:59:51.679958370 -0800 +++ nginx-1.28.0-patched/src/core/ngx_core.h 2017-12-16 23:59:51.679958370 -0800
@@ -108,4 +108,6 @@ void ngx_cpuinfo(void); @@ -108,4 +108,6 @@ void ngx_cpuinfo(void);
#define NGX_DISABLE_SYMLINKS_NOTOWNER 2 #define NGX_DISABLE_SYMLINKS_NOTOWNER 2
#endif #endif
@ -28,9 +28,9 @@ diff -rup nginx-1.27.5/src/core/ngx_core.h nginx-1.27.5-patched/src/core/ngx_cor
+extern ngx_pool_t *saved_init_cycle_pool; +extern ngx_pool_t *saved_init_cycle_pool;
+ +
#endif /* _NGX_CORE_H_INCLUDED_ */ #endif /* _NGX_CORE_H_INCLUDED_ */
diff -rup nginx-1.27.5/src/core/ngx_cycle.c nginx-1.27.5-patched/src/core/ngx_cycle.c diff -rup nginx-1.28.0/src/core/ngx_cycle.c nginx-1.28.0-patched/src/core/ngx_cycle.c
--- nginx-1.27.5/src/core/ngx_cycle.c 2017-10-10 08:22:51.000000000 -0700 --- nginx-1.28.0/src/core/ngx_cycle.c 2017-10-10 08:22:51.000000000 -0700
+++ nginx-1.27.5-patched/src/core/ngx_cycle.c 2017-12-16 23:59:51.678958419 -0800 +++ nginx-1.28.0-patched/src/core/ngx_cycle.c 2017-12-16 23:59:51.678958419 -0800
@@ -748,6 +748,10 @@ old_shm_zone_done: @@ -748,6 +748,10 @@ old_shm_zone_done:
if (ngx_process == NGX_PROCESS_MASTER || ngx_is_init_cycle(old_cycle)) { if (ngx_process == NGX_PROCESS_MASTER || ngx_is_init_cycle(old_cycle)) {
@ -42,9 +42,9 @@ diff -rup nginx-1.27.5/src/core/ngx_cycle.c nginx-1.27.5-patched/src/core/ngx_cy
ngx_destroy_pool(old_cycle->pool); ngx_destroy_pool(old_cycle->pool);
cycle->old_cycle = NULL; cycle->old_cycle = NULL;
diff -rup nginx-1.27.5/src/os/unix/ngx_process_cycle.c nginx-1.27.5-patched/src/os/unix/ngx_process_cycle.c diff -rup nginx-1.28.0/src/os/unix/ngx_process_cycle.c nginx-1.28.0-patched/src/os/unix/ngx_process_cycle.c
--- nginx-1.27.5/src/os/unix/ngx_process_cycle.c 2017-12-17 00:00:38.142469762 -0800 --- nginx-1.28.0/src/os/unix/ngx_process_cycle.c 2017-12-17 00:00:38.142469762 -0800
+++ nginx-1.27.5-patched/src/os/unix/ngx_process_cycle.c 2017-12-16 23:59:51.691957791 -0800 +++ nginx-1.28.0-patched/src/os/unix/ngx_process_cycle.c 2017-12-16 23:59:51.691957791 -0800
@@ -687,6 +692,11 @@ ngx_master_process_exit(ngx_cycle_t *cyc @@ -687,6 +692,11 @@ ngx_master_process_exit(ngx_cycle_t *cyc
ngx_exit_cycle.files_n = ngx_cycle->files_n; ngx_exit_cycle.files_n = ngx_cycle->files_n;
ngx_cycle = &ngx_exit_cycle; ngx_cycle = &ngx_exit_cycle;

@ -1,5 +1,5 @@
--- nginx-1.27.5/src/event/quic/ngx_event_quic_transport.c 2024-08-06 16:52:18.545250210 +0800 --- nginx-1.28.0/src/event/quic/ngx_event_quic_transport.c 2024-08-06 16:52:18.545250210 +0800
+++ nginx-1.27.5-patched/src/event/quic/ngx_event_quic_transport.c 2024-08-06 16:52:29.691035755 +0800 +++ nginx-1.28.0-patched/src/event/quic/ngx_event_quic_transport.c 2024-08-06 16:52:29.691035755 +0800
@@ -1720,7 +1720,7 @@ @@ -1720,7 +1720,7 @@
ngx_quic_parse_transport_params(u_char *p, u_char *end, ngx_quic_tp_t *tp, ngx_quic_parse_transport_params(u_char *p, u_char *end, ngx_quic_tp_t *tp,
ngx_log_t *log) ngx_log_t *log)

@ -1,5 +1,5 @@
--- nginx-1.27.5/src/core/ngx_log.h 2013-10-08 05:07:14.000000000 -0700 --- nginx-1.28.0/src/core/ngx_log.h 2013-10-08 05:07:14.000000000 -0700
+++ nginx-1.27.5-patched/src/core/ngx_log.h 2013-12-05 20:35:35.996236720 -0800 +++ nginx-1.28.0-patched/src/core/ngx_log.h 2013-12-05 20:35:35.996236720 -0800
@@ -64,7 +64,9 @@ struct ngx_log_s { @@ -64,7 +64,9 @@ struct ngx_log_s {
}; };

@ -0,0 +1,36 @@
diff -urp nginx-1.28.0/auto/cc/clang nginx-1.28.0-patched/auto/cc/clang
--- nginx-1.28.0/auto/cc/clang 2014-03-04 03:39:24.000000000 -0800
+++ nginx-1.28.0-patched/auto/cc/clang 2014-03-13 20:54:26.241413360 -0700
@@ -89,7 +89,7 @@ CFLAGS="$CFLAGS -Wconditional-uninitiali
CFLAGS="$CFLAGS -Wno-unused-parameter"
# stop on warning
-CFLAGS="$CFLAGS -Werror"
+#CFLAGS="$CFLAGS -Werror"
# debug
CFLAGS="$CFLAGS -g"
diff -urp nginx-1.28.0/auto/cc/gcc nginx-1.28.0-patched/auto/cc/gcc
--- nginx-1.28.0/auto/cc/gcc 2014-03-04 03:39:24.000000000 -0800
+++ nginx-1.28.0-patched/auto/cc/gcc 2014-03-13 20:54:13.301355329 -0700
@@ -168,7 +168,7 @@ esac
# stop on warning
-CFLAGS="$CFLAGS -Werror"
+#CFLAGS="$CFLAGS -Werror"
# debug
CFLAGS="$CFLAGS -g"
diff -urp nginx-1.28.0/auto/cc/icc nginx-1.28.0-patched/auto/cc/icc
--- nginx-1.28.0/auto/cc/icc 2014-03-04 03:39:24.000000000 -0800
+++ nginx-1.28.0-patched/auto/cc/icc 2014-03-13 20:54:13.301355329 -0700
@@ -115,7 +115,7 @@ case "$NGX_ICC_VER" in
esac
# stop on warning
-CFLAGS="$CFLAGS -Werror"
+#CFLAGS="$CFLAGS -Werror"
# debug
CFLAGS="$CFLAGS -g"

@ -1,6 +1,6 @@
diff -upr nginx-1.27.5/src/http/ngx_http_core_module.c nginx-1.27.5-patched/src/http/ngx_http_core_module.c diff -upr nginx-1.28.0/src/http/ngx_http_core_module.c nginx-1.28.0-patched/src/http/ngx_http_core_module.c
--- nginx-1.27.5/src/http/ngx_http_core_module.c 2017-08-31 18:14:41.000000000 -0700 --- nginx-1.28.0/src/http/ngx_http_core_module.c 2017-08-31 18:14:41.000000000 -0700
+++ nginx-1.27.5-patched/src/http/ngx_http_core_module.c 2017-08-31 18:21:31.638098196 -0700 +++ nginx-1.28.0-patched/src/http/ngx_http_core_module.c 2017-08-31 18:21:31.638098196 -0700
@@ -64,6 +64,8 @@ static char *ngx_http_core_directio(ngx_conf_t *cf, ngx_command_t *cmd, @@ -64,6 +64,8 @@ static char *ngx_http_core_directio(ngx_conf_t *cf, ngx_command_t *cmd,
void *conf); void *conf);
static char *ngx_http_core_error_page(ngx_conf_t *cf, ngx_command_t *cmd, static char *ngx_http_core_error_page(ngx_conf_t *cf, ngx_command_t *cmd,

@ -1,18 +1,18 @@
diff --minimal '--exclude=*.swp' '--exclude=*~' -up nginx-1.27.5/src/core/nginx.h nginx-1.27.5-patched/src/core/nginx.h diff --minimal '--exclude=*.swp' '--exclude=*~' -up nginx-1.28.0/src/core/nginx.h nginx-1.28.0-patched/src/core/nginx.h
--- nginx-1.27.5/src/core/nginx.h 2016-04-19 09:02:38.000000000 -0700 --- nginx-1.28.0/src/core/nginx.h 2016-04-19 09:02:38.000000000 -0700
+++ nginx-1.27.5-patched/src/core/nginx.h 2016-04-21 16:25:07.452944624 -0700 +++ nginx-1.28.0-patched/src/core/nginx.h 2016-04-21 16:25:07.452944624 -0700
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
#define nginx_version 1027001 #define nginx_version 1027001
#define NGINX_VERSION "1.27.5" #define NGINX_VERSION "1.28.0"
-#define NGINX_VER "openresty/" NGINX_VERSION ".unknown" -#define NGINX_VER "openresty/" NGINX_VERSION ".unknown"
+#define NGINX_VER "openresty/" NGINX_VERSION ".unknown (no pool)" +#define NGINX_VER "openresty/" NGINX_VERSION ".unknown (no pool)"
#ifdef NGX_BUILD #ifdef NGX_BUILD
diff --minimal '--exclude=*.swp' '--exclude=*~' -up nginx-1.27.5/src/core/ngx_array.c nginx-1.27.5-patched/src/core/ngx_array.c diff --minimal '--exclude=*.swp' '--exclude=*~' -up nginx-1.28.0/src/core/ngx_array.c nginx-1.28.0-patched/src/core/ngx_array.c
--- nginx-1.27.5/src/core/ngx_array.c 2016-04-19 09:02:38.000000000 -0700 --- nginx-1.28.0/src/core/ngx_array.c 2016-04-19 09:02:38.000000000 -0700
+++ nginx-1.27.5-patched/src/core/ngx_array.c 2016-04-21 16:25:07.453947190 -0700 +++ nginx-1.28.0-patched/src/core/ngx_array.c 2016-04-21 16:25:07.453947190 -0700
@@ -30,26 +30,30 @@ ngx_array_create(ngx_pool_t *p, ngx_uint @@ -30,26 +30,30 @@ ngx_array_create(ngx_pool_t *p, ngx_uint
void void
ngx_array_destroy(ngx_array_t *a) ngx_array_destroy(ngx_array_t *a)
@ -160,9 +160,9 @@ diff --minimal '--exclude=*.swp' '--exclude=*~' -up nginx-1.27.5/src/core/ngx_ar
} }
elt = (u_char *) a->elts + a->size * a->nelts; elt = (u_char *) a->elts + a->size * a->nelts;
diff --minimal '--exclude=*.swp' '--exclude=*~' -up nginx-1.27.5/src/core/ngx_array.h nginx-1.27.5-patched/src/core/ngx_array.h diff --minimal '--exclude=*.swp' '--exclude=*~' -up nginx-1.28.0/src/core/ngx_array.h nginx-1.28.0-patched/src/core/ngx_array.h
--- nginx-1.27.5/src/core/ngx_array.h 2016-04-19 09:02:38.000000000 -0700 --- nginx-1.28.0/src/core/ngx_array.h 2016-04-19 09:02:38.000000000 -0700
+++ nginx-1.27.5-patched/src/core/ngx_array.h 2016-04-21 16:25:07.453947190 -0700 +++ nginx-1.28.0-patched/src/core/ngx_array.h 2016-04-21 16:25:07.453947190 -0700
@@ -13,12 +13,23 @@ @@ -13,12 +13,23 @@
#include <ngx_core.h> #include <ngx_core.h>
@ -195,9 +195,9 @@ diff --minimal '--exclude=*.swp' '--exclude=*~' -up nginx-1.27.5/src/core/ngx_ar
array->elts = ngx_palloc(pool, n * size); array->elts = ngx_palloc(pool, n * size);
if (array->elts == NULL) { if (array->elts == NULL) {
diff --minimal '--exclude=*.swp' '--exclude=*~' -up nginx-1.27.5/src/core/ngx_palloc.c nginx-1.27.5-patched/src/core/ngx_palloc.c diff --minimal '--exclude=*.swp' '--exclude=*~' -up nginx-1.28.0/src/core/ngx_palloc.c nginx-1.28.0-patched/src/core/ngx_palloc.c
--- nginx-1.27.5/src/core/ngx_palloc.c 2016-04-19 09:02:38.000000000 -0700 --- nginx-1.28.0/src/core/ngx_palloc.c 2016-04-19 09:02:38.000000000 -0700
+++ nginx-1.27.5-patched/src/core/ngx_palloc.c 2016-04-21 16:25:45.912282685 -0700 +++ nginx-1.28.0-patched/src/core/ngx_palloc.c 2016-04-21 16:25:45.912282685 -0700
@@ -9,34 +9,26 @@ @@ -9,34 +9,26 @@
#include <ngx_core.h> #include <ngx_core.h>
@ -546,9 +546,9 @@ diff --minimal '--exclude=*.swp' '--exclude=*~' -up nginx-1.27.5/src/core/ngx_pa
return NGX_OK; return NGX_OK;
} }
diff --minimal '--exclude=*.swp' '--exclude=*~' -up nginx-1.27.5/src/core/ngx_palloc.h nginx-1.27.5-patched/src/core/ngx_palloc.h diff --minimal '--exclude=*.swp' '--exclude=*~' -up nginx-1.28.0/src/core/ngx_palloc.h nginx-1.28.0-patched/src/core/ngx_palloc.h
--- nginx-1.27.5/src/core/ngx_palloc.h 2016-04-19 09:02:38.000000000 -0700 --- nginx-1.28.0/src/core/ngx_palloc.h 2016-04-19 09:02:38.000000000 -0700
+++ nginx-1.27.5-patched/src/core/ngx_palloc.h 2016-04-21 16:25:07.454949755 -0700 +++ nginx-1.28.0-patched/src/core/ngx_palloc.h 2016-04-21 16:25:07.454949755 -0700
@@ -38,28 +38,21 @@ struct ngx_pool_cleanup_s { @@ -38,28 +38,21 @@ struct ngx_pool_cleanup_s {
}; };

@ -1,5 +1,5 @@
--- nginx-1.27.5/src/http/modules/ngx_http_proxy_module.c 2017-07-16 14:02:51.000000000 +0800 --- nginx-1.28.0/src/http/modules/ngx_http_proxy_module.c 2017-07-16 14:02:51.000000000 +0800
+++ nginx-1.27.5-patched/src/http/modules/ngx_http_proxy_module.c 2017-07-16 14:02:51.000000000 +0800 +++ nginx-1.28.0-patched/src/http/modules/ngx_http_proxy_module.c 2017-07-16 14:02:51.000000000 +0800
@@ -793,13 +793,13 @@ static ngx_keyval_t ngx_http_proxy_cach @@ -793,13 +793,13 @@ static ngx_keyval_t ngx_http_proxy_cach
static ngx_http_variable_t ngx_http_proxy_vars[] = { static ngx_http_variable_t ngx_http_proxy_vars[] = {

@ -5,7 +5,7 @@ index a3c0ef8..1263881 100644
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
#define nginx_version 1027001 #define nginx_version 1027001
#define NGINX_VERSION "1.27.5" #define NGINX_VERSION "1.28.0"
-#define NGINX_VER "nginx/" NGINX_VERSION -#define NGINX_VER "nginx/" NGINX_VERSION
+#define NGINX_VER "openresty/" NGINX_VERSION ".unknown" +#define NGINX_VER "openresty/" NGINX_VERSION ".unknown"

@ -1,6 +1,6 @@
diff -u -r -p -Naur nginx-1.27.5/src/stream/ngx_stream.h nginx-1.27.5-patched/src/stream/ngx_stream.h diff -u -r -p -Naur nginx-1.28.0/src/stream/ngx_stream.h nginx-1.28.0-patched/src/stream/ngx_stream.h
--- nginx-1.27.5/src/stream/ngx_stream.h 2021-11-04 21:27:55.288708527 +0800 --- nginx-1.28.0/src/stream/ngx_stream.h 2021-11-04 21:27:55.288708527 +0800
+++ nginx-1.27.5-patched/src/stream/ngx_stream.h 2021-11-04 21:28:50.768035209 +0800 +++ nginx-1.28.0-patched/src/stream/ngx_stream.h 2021-11-04 21:28:50.768035209 +0800
@@ -254,6 +254,15 @@ typedef struct { @@ -254,6 +254,15 @@ typedef struct {
} ngx_stream_module_t; } ngx_stream_module_t;
@ -25,9 +25,9 @@ diff -u -r -p -Naur nginx-1.27.5/src/stream/ngx_stream.h nginx-1.27.5-patched/sr
typedef ngx_int_t (*ngx_stream_filter_pt)(ngx_stream_session_t *s, typedef ngx_int_t (*ngx_stream_filter_pt)(ngx_stream_session_t *s,
diff -u -r -p -Naur nginx-1.27.5/src/stream/ngx_stream_proxy_module.c nginx-1.27.5-patched/src/stream/ngx_stream_proxy_module.c diff -u -r -p -Naur nginx-1.28.0/src/stream/ngx_stream_proxy_module.c nginx-1.28.0-patched/src/stream/ngx_stream_proxy_module.c
--- nginx-1.27.5/src/stream/ngx_stream_proxy_module.c 2021-11-04 21:27:55.289708533 +0800 --- nginx-1.28.0/src/stream/ngx_stream_proxy_module.c 2021-11-04 21:27:55.289708533 +0800
+++ nginx-1.27.5-patched/src/stream/ngx_stream_proxy_module.c 2021-11-04 21:37:03.578936990 +0800 +++ nginx-1.28.0-patched/src/stream/ngx_stream_proxy_module.c 2021-11-04 21:37:03.578936990 +0800
@@ -400,6 +400,7 @@ ngx_stream_proxy_handler(ngx_stream_sess @@ -400,6 +400,7 @@ ngx_stream_proxy_handler(ngx_stream_sess
ngx_stream_proxy_srv_conf_t *pscf; ngx_stream_proxy_srv_conf_t *pscf;
ngx_stream_upstream_srv_conf_t *uscf, **uscfp; ngx_stream_upstream_srv_conf_t *uscf, **uscfp;

File diff suppressed because it is too large Load Diff

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
main_ver=1.27.5 main_ver=1.28.0
minor_ver=1 minor_ver=1
version=$main_ver.$minor_ver version=$main_ver.$minor_ver
echo $version echo $version

Loading…
Cancel
Save