-
Notifications
You must be signed in to change notification settings - Fork 8.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
dc3acbd
commit b4e6d09
Showing
36 changed files
with
195 additions
and
80 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions
6
...ches/17_nginx-1.25.3-no_error_pages.patch → ...ches/17_nginx-1.27.1-no_error_pages.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 0 additions & 36 deletions
36
images/nginx/rootfs/patches/18_nginx-1.25.3-no_Werror.patch
This file was deleted.
Oops, something went wrong.
36 changes: 36 additions & 0 deletions
36
images/nginx/rootfs/patches/18_nginx-1.27.1-no_Werror.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| diff -urp nginx-1.27.1/auto/cc/clang nginx-1.27.1-patched/auto/cc/clang | ||
| --- nginx-1.27.1/auto/cc/clang 2014-03-04 03:39:24.000000000 -0800 | ||
| +++ nginx-1.27.1-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.1/auto/cc/gcc nginx-1.27.1-patched/auto/cc/gcc | ||
| --- nginx-1.27.1/auto/cc/gcc 2014-03-04 03:39:24.000000000 -0800 | ||
| +++ nginx-1.27.1-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.1/auto/cc/icc nginx-1.27.1-patched/auto/cc/icc | ||
| --- nginx-1.27.1/auto/cc/icc 2014-03-04 03:39:24.000000000 -0800 | ||
| +++ nginx-1.27.1-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" |
File renamed without changes.
4 changes: 2 additions & 2 deletions
4
...0_nginx-1.25.3-proxy_host_port_vars.patch → ...0_nginx-1.27.1-proxy_host_port_vars.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
4 changes: 2 additions & 2 deletions
4
...2_nginx-1.25.3-larger_max_error_str.patch → ...2_nginx-1.27.1-larger_max_error_str.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
4 changes: 2 additions & 2 deletions
4
...25.3-always_enable_cc_feature_tests.patch → ...27.1-always_enable_cc_feature_tests.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
27 changes: 27 additions & 0 deletions
27
images/nginx/rootfs/patches/nginx-1.27.1-balancer_pool_max_retry.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c | ||
| index d04d91e..397cb08 100644 | ||
| --- a/src/http/ngx_http_upstream.c | ||
| +++ b/src/http/ngx_http_upstream.c | ||
| @@ -4378,6 +4378,9 @@ ngx_http_upstream_next(ngx_http_request_t *r, ngx_http_upstream_t *u, | ||
| if (u->peer.cached && ft_type == NGX_HTTP_UPSTREAM_FT_ERROR) { | ||
| /* TODO: inform balancer instead */ | ||
| u->peer.tries++; | ||
| + if (u->peer.notify) { | ||
| + u->peer.notify(&u->peer, u->peer.data, NGX_HTTP_UPSTREAM_NOTIFY_CACHED_CONNECTION_ERROR); | ||
| + } | ||
| } | ||
|
|
||
| switch (ft_type) { | ||
| diff --git a/src/http/ngx_http_upstream.h b/src/http/ngx_http_upstream.h | ||
| index f6621af..2b5957e 100644 | ||
| --- a/src/http/ngx_http_upstream.h | ||
| +++ b/src/http/ngx_http_upstream.h | ||
| @@ -55,6 +55,8 @@ | ||
| #define NGX_HTTP_UPSTREAM_IGN_XA_CHARSET 0x00000100 | ||
| #define NGX_HTTP_UPSTREAM_IGN_VARY 0x00000200 | ||
|
|
||
| +#define NGX_HTTP_UPSTREAM_NOTIFY_CACHED_CONNECTION_ERROR 0x1 | ||
| + | ||
|
|
||
| typedef struct { | ||
| ngx_uint_t status; |
11 changes: 11 additions & 0 deletions
11
images/nginx/rootfs/patches/nginx-1.27.1-initialize_quic_transport_id_variable.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| --- nginx-1.27.1/src/event/quic/ngx_event_quic_transport.c 2024-08-06 16:52:18.545250210 +0800 | ||
| +++ nginx-1.27.1-patched/src/event/quic/ngx_event_quic_transport.c 2024-08-06 16:52:29.691035755 +0800 | ||
| @@ -1720,7 +1720,7 @@ | ||
| ngx_quic_parse_transport_params(u_char *p, u_char *end, ngx_quic_tp_t *tp, | ||
| ngx_log_t *log) | ||
| { | ||
| - uint64_t id, len; | ||
| + uint64_t id = 0, len; | ||
| ngx_int_t rc; | ||
|
|
||
| while (p < end) { |
77 changes: 77 additions & 0 deletions
77
images/nginx/rootfs/patches/nginx-1.27.1-proc_exit_handler.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c | ||
| index c4e3c50..fa1408b 100644 | ||
| --- a/src/core/ngx_cycle.c | ||
| +++ b/src/core/ngx_cycle.c | ||
| @@ -264,6 +264,9 @@ ngx_init_cycle(ngx_cycle_t *old_cycle) | ||
| } | ||
|
|
||
|
|
||
| +#if !(NGX_WIN32) | ||
| + ngx_proc_exit_top_handler = ngx_proc_exit_def_handler; | ||
| +#endif | ||
| conf.ctx = cycle->conf_ctx; | ||
| conf.cycle = cycle; | ||
| conf.pool = pool; | ||
| diff --git a/src/os/unix/ngx_process.c b/src/os/unix/ngx_process.c | ||
| index 12a8c68..874c9bf 100644 | ||
| --- a/src/os/unix/ngx_process.c | ||
| +++ b/src/os/unix/ngx_process.c | ||
| @@ -34,6 +34,7 @@ ngx_int_t ngx_process_slot; | ||
| ngx_socket_t ngx_channel; | ||
| ngx_int_t ngx_last_process; | ||
| ngx_process_t ngx_processes[NGX_MAX_PROCESSES]; | ||
| +ngx_proc_exit_pt ngx_proc_exit_top_handler; | ||
|
|
||
|
|
||
| ngx_signal_t signals[] = { | ||
| @@ -83,6 +84,13 @@ ngx_signal_t signals[] = { | ||
| }; | ||
|
|
||
|
|
||
| +void | ||
| +ngx_proc_exit_def_handler(ngx_pid_t pid) | ||
| +{ | ||
| + /* do nothing */ | ||
| +} | ||
| + | ||
| + | ||
| ngx_pid_t | ||
| ngx_spawn_process(ngx_cycle_t *cycle, ngx_spawn_proc_pt proc, void *data, | ||
| char *name, ngx_int_t respawn) | ||
| @@ -564,6 +572,7 @@ ngx_process_get_status(void) | ||
| } | ||
|
|
||
| ngx_unlock_mutexes(pid); | ||
| + ngx_proc_exit_top_handler(pid); | ||
| } | ||
| } | ||
|
|
||
| diff --git a/src/os/unix/ngx_process.h b/src/os/unix/ngx_process.h | ||
| index 3986639..0b55d98 100644 | ||
| --- a/src/os/unix/ngx_process.h | ||
| +++ b/src/os/unix/ngx_process.h | ||
| @@ -18,6 +18,8 @@ typedef pid_t ngx_pid_t; | ||
| #define NGX_INVALID_PID -1 | ||
|
|
||
| typedef void (*ngx_spawn_proc_pt) (ngx_cycle_t *cycle, void *data); | ||
| +#define NGX_HAVE_PROC_EXIT 1 | ||
| +typedef void (*ngx_proc_exit_pt)(ngx_pid_t pid); | ||
|
|
||
| typedef struct { | ||
| ngx_pid_t pid; | ||
| @@ -66,6 +68,7 @@ ngx_pid_t ngx_spawn_process(ngx_cycle_t *cycle, | ||
| ngx_pid_t ngx_execute(ngx_cycle_t *cycle, ngx_exec_ctx_t *ctx); | ||
| ngx_int_t ngx_init_signals(ngx_log_t *log); | ||
| void ngx_debug_point(void); | ||
| +void ngx_proc_exit_def_handler(ngx_pid_t pid); | ||
|
|
||
|
|
||
| #if (NGX_HAVE_SCHED_YIELD) | ||
| @@ -85,6 +88,7 @@ extern ngx_socket_t ngx_channel; | ||
| extern ngx_int_t ngx_process_slot; | ||
| extern ngx_int_t ngx_last_process; | ||
| extern ngx_process_t ngx_processes[NGX_MAX_PROCESSES]; | ||
| +extern ngx_proc_exit_pt ngx_proc_exit_top_handler; | ||
|
|
||
|
|
||
| #endif /* _NGX_PROCESS_H_INCLUDED_ */ |