-
Notifications
You must be signed in to change notification settings - Fork 8.2k
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 6d1e53c
Showing
41 changed files
with
898 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
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.
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
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; |
File renamed without changes.
13 changes: 13 additions & 0 deletions
13
images/nginx/rootfs/patches/nginx-1.27.1-builtin_error_page_footer.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,13 @@ | ||
| diff --git a/src/http/ngx_http_special_response.c b/src/http/ngx_http_special_response.c | ||
| index 64e5acd..f5374f6 100644 | ||
| --- a/src/http/ngx_http_special_response.c | ||
| +++ b/src/http/ngx_http_special_response.c | ||
| @@ -26,7 +26,7 @@ static u_char ngx_http_error_full_tail[] = | ||
|
|
||
|
|
||
| static u_char ngx_http_error_tail[] = | ||
| -"<hr><center>nginx</center>" CRLF | ||
| +"<hr><center>openresty</center>" CRLF | ||
| "</body>" CRLF | ||
| "</html>" CRLF | ||
| ; |
File renamed without changes.
File renamed without changes.
File renamed without changes.
20 changes: 20 additions & 0 deletions
20
images/nginx/rootfs/patches/nginx-1.27.1-hash_overflow.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,20 @@ | ||
| # HG changeset patch | ||
| # User Yichun Zhang <agentzh@gmail.com> | ||
| # Date 1412276417 25200 | ||
| # Thu Oct 02 12:00:17 2014 -0700 | ||
| # Node ID 4032b992f23b054c1a2cfb0be879330d2c6708e5 | ||
| # Parent 1ff0f68d9376e3d184d65814a6372856bf65cfcd | ||
| Hash: buffer overflow might happen when exceeding the pre-configured limits. | ||
|
|
||
| diff -r 1ff0f68d9376 -r 4032b992f23b src/core/ngx_hash.c | ||
| --- a/src/core/ngx_hash.c Tue Sep 30 15:50:28 2014 -0700 | ||
| +++ b/src/core/ngx_hash.c Thu Oct 02 12:00:17 2014 -0700 | ||
| @@ -312,6 +312,8 @@ ngx_hash_init(ngx_hash_init_t *hinit, ng | ||
| continue; | ||
| } | ||
|
|
||
| + size--; | ||
| + | ||
| ngx_log_error(NGX_LOG_WARN, hinit->pool->log, 0, | ||
| "could not build optimal %s, you should increase " | ||
| "either %s_max_size: %i or %s_bucket_size: %i; " |
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
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) { |
File renamed without changes.
4 changes: 2 additions & 2 deletions
4
...2_nginx-1.25.3-larger_max_error_str.patch → ...s/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.
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" |
6 changes: 3 additions & 3 deletions
6
...ches/17_nginx-1.25.3-no_error_pages.patch → ...patches/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
Oops, something went wrong.