mirror of https://github.com/openresty/openresty
feature: bump nginx to 1.28.0
parent
008aec1953
commit
852665bec7
@ -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,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,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[] = {
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue