diff --git a/patches/nginx/1.28.0/nginx-1.28.0-no_Werror.patch b/patches/nginx/1.28.0/nginx-1.28.0-no_Werror.patch deleted file mode 100644 index 17c2395..0000000 --- a/patches/nginx/1.28.0/nginx-1.28.0-no_Werror.patch +++ /dev/null @@ -1,36 +0,0 @@ -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" diff --git a/patches/nginx/1.28.0/nginx-1.28.0-always_enable_cc_feature_tests.patch b/patches/nginx/1.29.0/nginx-1.29.0-always_enable_cc_feature_tests.patch similarity index 65% rename from patches/nginx/1.28.0/nginx-1.28.0-always_enable_cc_feature_tests.patch rename to patches/nginx/1.29.0/nginx-1.29.0-always_enable_cc_feature_tests.patch index bb6a472..fda08e3 100644 --- a/patches/nginx/1.28.0/nginx-1.28.0-always_enable_cc_feature_tests.patch +++ b/patches/nginx/1.29.0/nginx-1.29.0-always_enable_cc_feature_tests.patch @@ -1,5 +1,5 @@ ---- nginx-1.28.0/auto/cc/conf 2015-10-30 22:47:50.000000000 +0800 -+++ nginx-1.28.0-patched/auto/cc/conf 2015-11-02 12:23:05.385156987 +0800 +--- nginx-1.29.0/auto/cc/conf 2015-10-30 22:47:50.000000000 +0800 ++++ nginx-1.29.0-patched/auto/cc/conf 2015-11-02 12:23:05.385156987 +0800 @@ -144,7 +144,7 @@ fi CFLAGS="$CFLAGS $NGX_CC_OPT" NGX_TEST_LD_OPT="$NGX_LD_OPT" diff --git a/patches/nginx/1.28.0/nginx-1.28.0-balancer_pool_max_retry.patch b/patches/nginx/1.29.0/nginx-1.29.0-balancer_pool_max_retry.patch similarity index 100% rename from patches/nginx/1.28.0/nginx-1.28.0-balancer_pool_max_retry.patch rename to patches/nginx/1.29.0/nginx-1.29.0-balancer_pool_max_retry.patch diff --git a/patches/nginx/1.28.0/nginx-1.28.0-balancer_status_code.patch b/patches/nginx/1.29.0/nginx-1.29.0-balancer_status_code.patch similarity index 100% rename from patches/nginx/1.28.0/nginx-1.28.0-balancer_status_code.patch rename to patches/nginx/1.29.0/nginx-1.29.0-balancer_status_code.patch diff --git a/patches/nginx/1.28.0/nginx-1.28.0-builtin_error_page_footer.patch b/patches/nginx/1.29.0/nginx-1.29.0-builtin_error_page_footer.patch similarity index 100% rename from patches/nginx/1.28.0/nginx-1.28.0-builtin_error_page_footer.patch rename to patches/nginx/1.29.0/nginx-1.29.0-builtin_error_page_footer.patch diff --git a/patches/nginx/1.28.0/nginx-1.28.0-cache_manager_exit.patch b/patches/nginx/1.29.0/nginx-1.29.0-cache_manager_exit.patch similarity index 100% rename from patches/nginx/1.28.0/nginx-1.28.0-cache_manager_exit.patch rename to patches/nginx/1.29.0/nginx-1.29.0-cache_manager_exit.patch diff --git a/patches/nginx/1.28.0/nginx-1.28.0-daemon_destroy_pool.patch b/patches/nginx/1.29.0/nginx-1.29.0-daemon_destroy_pool.patch similarity index 100% rename from patches/nginx/1.28.0/nginx-1.28.0-daemon_destroy_pool.patch rename to patches/nginx/1.29.0/nginx-1.29.0-daemon_destroy_pool.patch diff --git a/patches/nginx/1.28.0/nginx-1.28.0-delayed_posted_events.patch b/patches/nginx/1.29.0/nginx-1.29.0-delayed_posted_events.patch similarity index 100% rename from patches/nginx/1.28.0/nginx-1.28.0-delayed_posted_events.patch rename to patches/nginx/1.29.0/nginx-1.29.0-delayed_posted_events.patch diff --git a/patches/nginx/1.28.0/nginx-1.28.0-hash_overflow.patch b/patches/nginx/1.29.0/nginx-1.29.0-hash_overflow.patch similarity index 100% rename from patches/nginx/1.28.0/nginx-1.28.0-hash_overflow.patch rename to patches/nginx/1.29.0/nginx-1.29.0-hash_overflow.patch diff --git a/patches/nginx/1.28.0/nginx-1.28.0-init_cycle_pool_release.patch b/patches/nginx/1.29.0/nginx-1.29.0-init_cycle_pool_release.patch similarity index 65% rename from patches/nginx/1.28.0/nginx-1.28.0-init_cycle_pool_release.patch rename to patches/nginx/1.29.0/nginx-1.29.0-init_cycle_pool_release.patch index c47a652..4f9af5b 100644 --- a/patches/nginx/1.28.0/nginx-1.28.0-init_cycle_pool_release.patch +++ b/patches/nginx/1.29.0/nginx-1.29.0-init_cycle_pool_release.patch @@ -1,6 +1,6 @@ -diff -rup nginx-1.28.0/src/core/nginx.c nginx-1.28.0-patched/src/core/nginx.c ---- nginx-1.28.0/src/core/nginx.c 2017-12-17 00:00:38.136470108 -0800 -+++ nginx-1.28.0-patched/src/core/nginx.c 2017-12-16 23:59:51.680958322 -0800 +diff -rup nginx-1.29.0/src/core/nginx.c nginx-1.29.0-patched/src/core/nginx.c +--- nginx-1.29.0/src/core/nginx.c 2017-12-17 00:00:38.136470108 -0800 ++++ nginx-1.29.0-patched/src/core/nginx.c 2017-12-16 23:59:51.680958322 -0800 @@ -186,6 +186,7 @@ static u_char *ngx_prefix; static u_char *ngx_conf_file; static u_char *ngx_conf_params; @@ -18,9 +18,9 @@ diff -rup nginx-1.28.0/src/core/nginx.c nginx-1.28.0-patched/src/core/nginx.c if (ngx_save_argv(&init_cycle, argc, argv) != NGX_OK) { return 1; } -diff -rup nginx-1.28.0/src/core/ngx_core.h nginx-1.28.0-patched/src/core/ngx_core.h ---- nginx-1.28.0/src/core/ngx_core.h 2017-10-10 08:22:51.000000000 -0700 -+++ nginx-1.28.0-patched/src/core/ngx_core.h 2017-12-16 23:59:51.679958370 -0800 +diff -rup nginx-1.29.0/src/core/ngx_core.h nginx-1.29.0-patched/src/core/ngx_core.h +--- nginx-1.29.0/src/core/ngx_core.h 2017-10-10 08:22:51.000000000 -0700 ++++ nginx-1.29.0-patched/src/core/ngx_core.h 2017-12-16 23:59:51.679958370 -0800 @@ -108,4 +108,6 @@ void ngx_cpuinfo(void); #define NGX_DISABLE_SYMLINKS_NOTOWNER 2 #endif @@ -28,9 +28,9 @@ diff -rup nginx-1.28.0/src/core/ngx_core.h nginx-1.28.0-patched/src/core/ngx_cor +extern ngx_pool_t *saved_init_cycle_pool; + #endif /* _NGX_CORE_H_INCLUDED_ */ -diff -rup nginx-1.28.0/src/core/ngx_cycle.c nginx-1.28.0-patched/src/core/ngx_cycle.c ---- nginx-1.28.0/src/core/ngx_cycle.c 2017-10-10 08:22:51.000000000 -0700 -+++ nginx-1.28.0-patched/src/core/ngx_cycle.c 2017-12-16 23:59:51.678958419 -0800 +diff -rup nginx-1.29.0/src/core/ngx_cycle.c nginx-1.29.0-patched/src/core/ngx_cycle.c +--- nginx-1.29.0/src/core/ngx_cycle.c 2017-10-10 08:22:51.000000000 -0700 ++++ nginx-1.29.0-patched/src/core/ngx_cycle.c 2017-12-16 23:59:51.678958419 -0800 @@ -748,6 +748,10 @@ old_shm_zone_done: if (ngx_process == NGX_PROCESS_MASTER || ngx_is_init_cycle(old_cycle)) { @@ -42,9 +42,9 @@ diff -rup nginx-1.28.0/src/core/ngx_cycle.c nginx-1.28.0-patched/src/core/ngx_cy ngx_destroy_pool(old_cycle->pool); cycle->old_cycle = NULL; -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.28.0/src/os/unix/ngx_process_cycle.c 2017-12-17 00:00:38.142469762 -0800 -+++ nginx-1.28.0-patched/src/os/unix/ngx_process_cycle.c 2017-12-16 23:59:51.691957791 -0800 +diff -rup nginx-1.29.0/src/os/unix/ngx_process_cycle.c nginx-1.29.0-patched/src/os/unix/ngx_process_cycle.c +--- nginx-1.29.0/src/os/unix/ngx_process_cycle.c 2017-12-17 00:00:38.142469762 -0800 ++++ nginx-1.29.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 ngx_exit_cycle.files_n = ngx_cycle->files_n; ngx_cycle = &ngx_exit_cycle; diff --git a/patches/nginx/1.28.0/nginx-1.28.0-initialize_quic_transport_id_variable.patch b/patches/nginx/1.29.0/nginx-1.29.0-initialize_quic_transport_id_variable.patch similarity index 69% rename from patches/nginx/1.28.0/nginx-1.28.0-initialize_quic_transport_id_variable.patch rename to patches/nginx/1.29.0/nginx-1.29.0-initialize_quic_transport_id_variable.patch index f23390d..ce93d65 100644 --- a/patches/nginx/1.28.0/nginx-1.28.0-initialize_quic_transport_id_variable.patch +++ b/patches/nginx/1.29.0/nginx-1.29.0-initialize_quic_transport_id_variable.patch @@ -1,5 +1,5 @@ ---- nginx-1.28.0/src/event/quic/ngx_event_quic_transport.c 2024-08-06 16:52:18.545250210 +0800 -+++ nginx-1.28.0-patched/src/event/quic/ngx_event_quic_transport.c 2024-08-06 16:52:29.691035755 +0800 +--- nginx-1.29.0/src/event/quic/ngx_event_quic_transport.c 2024-08-06 16:52:18.545250210 +0800 ++++ nginx-1.29.0-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) diff --git a/patches/nginx/1.28.0/nginx-1.28.0-intercept_error_log.patch b/patches/nginx/1.29.0/nginx-1.29.0-intercept_error_log.patch similarity index 100% rename from patches/nginx/1.28.0/nginx-1.28.0-intercept_error_log.patch rename to patches/nginx/1.29.0/nginx-1.29.0-intercept_error_log.patch diff --git a/patches/nginx/1.28.0/nginx-1.28.0-larger_max_error_str.patch b/patches/nginx/1.29.0/nginx-1.29.0-larger_max_error_str.patch similarity index 62% rename from patches/nginx/1.28.0/nginx-1.28.0-larger_max_error_str.patch rename to patches/nginx/1.29.0/nginx-1.29.0-larger_max_error_str.patch index 52fa283..697c873 100644 --- a/patches/nginx/1.28.0/nginx-1.28.0-larger_max_error_str.patch +++ b/patches/nginx/1.29.0/nginx-1.29.0-larger_max_error_str.patch @@ -1,5 +1,5 @@ ---- nginx-1.28.0/src/core/ngx_log.h 2013-10-08 05:07:14.000000000 -0700 -+++ nginx-1.28.0-patched/src/core/ngx_log.h 2013-12-05 20:35:35.996236720 -0800 +--- nginx-1.29.0/src/core/ngx_log.h 2013-10-08 05:07:14.000000000 -0700 ++++ nginx-1.29.0-patched/src/core/ngx_log.h 2013-12-05 20:35:35.996236720 -0800 @@ -64,7 +64,9 @@ struct ngx_log_s { }; diff --git a/patches/nginx/1.28.0/nginx-1.28.0-log_escape_non_ascii.patch b/patches/nginx/1.29.0/nginx-1.29.0-log_escape_non_ascii.patch similarity index 100% rename from patches/nginx/1.28.0/nginx-1.28.0-log_escape_non_ascii.patch rename to patches/nginx/1.29.0/nginx-1.29.0-log_escape_non_ascii.patch diff --git a/patches/nginx/1.29.0/nginx-1.29.0-no_Werror.patch b/patches/nginx/1.29.0/nginx-1.29.0-no_Werror.patch new file mode 100644 index 0000000..3e338e3 --- /dev/null +++ b/patches/nginx/1.29.0/nginx-1.29.0-no_Werror.patch @@ -0,0 +1,36 @@ +diff -urp nginx-1.29.0/auto/cc/clang nginx-1.29.0-patched/auto/cc/clang +--- nginx-1.29.0/auto/cc/clang 2014-03-04 03:39:24.000000000 -0800 ++++ nginx-1.29.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.29.0/auto/cc/gcc nginx-1.29.0-patched/auto/cc/gcc +--- nginx-1.29.0/auto/cc/gcc 2014-03-04 03:39:24.000000000 -0800 ++++ nginx-1.29.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.29.0/auto/cc/icc nginx-1.29.0-patched/auto/cc/icc +--- nginx-1.29.0/auto/cc/icc 2014-03-04 03:39:24.000000000 -0800 ++++ nginx-1.29.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" diff --git a/patches/nginx/1.28.0/nginx-1.28.0-no_error_pages.patch b/patches/nginx/1.29.0/nginx-1.29.0-no_error_pages.patch similarity index 93% rename from patches/nginx/1.28.0/nginx-1.28.0-no_error_pages.patch rename to patches/nginx/1.29.0/nginx-1.29.0-no_error_pages.patch index 2f6c686..e9fda3b 100644 --- a/patches/nginx/1.28.0/nginx-1.28.0-no_error_pages.patch +++ b/patches/nginx/1.29.0/nginx-1.29.0-no_error_pages.patch @@ -1,6 +1,6 @@ -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.28.0/src/http/ngx_http_core_module.c 2017-08-31 18:14:41.000000000 -0700 -+++ nginx-1.28.0-patched/src/http/ngx_http_core_module.c 2017-08-31 18:21:31.638098196 -0700 +diff -upr nginx-1.29.0/src/http/ngx_http_core_module.c nginx-1.29.0-patched/src/http/ngx_http_core_module.c +--- nginx-1.29.0/src/http/ngx_http_core_module.c 2017-08-31 18:14:41.000000000 -0700 ++++ nginx-1.29.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, void *conf); static char *ngx_http_core_error_page(ngx_conf_t *cf, ngx_command_t *cmd, diff --git a/patches/nginx/1.28.0/nginx-1.28.0-no_pool.patch b/patches/nginx/1.29.0/nginx-1.29.0-no_pool.patch similarity index 91% rename from patches/nginx/1.28.0/nginx-1.28.0-no_pool.patch rename to patches/nginx/1.29.0/nginx-1.29.0-no_pool.patch index 8810636..730d76c 100644 --- a/patches/nginx/1.28.0/nginx-1.28.0-no_pool.patch +++ b/patches/nginx/1.29.0/nginx-1.29.0-no_pool.patch @@ -1,18 +1,18 @@ -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.28.0/src/core/nginx.h 2016-04-19 09:02:38.000000000 -0700 -+++ nginx-1.28.0-patched/src/core/nginx.h 2016-04-21 16:25:07.452944624 -0700 +diff --minimal '--exclude=*.swp' '--exclude=*~' -up nginx-1.29.0/src/core/nginx.h nginx-1.29.0-patched/src/core/nginx.h +--- nginx-1.29.0/src/core/nginx.h 2016-04-19 09:02:38.000000000 -0700 ++++ nginx-1.29.0-patched/src/core/nginx.h 2016-04-21 16:25:07.452944624 -0700 @@ -10,7 +10,7 @@ #define nginx_version 1027001 - #define NGINX_VERSION "1.28.0" + #define NGINX_VERSION "1.29.0" -#define NGINX_VER "openresty/" NGINX_VERSION ".unknown" +#define NGINX_VER "openresty/" NGINX_VERSION ".unknown (no pool)" #ifdef NGX_BUILD -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.28.0/src/core/ngx_array.c 2016-04-19 09:02:38.000000000 -0700 -+++ nginx-1.28.0-patched/src/core/ngx_array.c 2016-04-21 16:25:07.453947190 -0700 +diff --minimal '--exclude=*.swp' '--exclude=*~' -up nginx-1.29.0/src/core/ngx_array.c nginx-1.29.0-patched/src/core/ngx_array.c +--- nginx-1.29.0/src/core/ngx_array.c 2016-04-19 09:02:38.000000000 -0700 ++++ nginx-1.29.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 void ngx_array_destroy(ngx_array_t *a) @@ -160,9 +160,9 @@ diff --minimal '--exclude=*.swp' '--exclude=*~' -up nginx-1.28.0/src/core/ngx_ar } elt = (u_char *) a->elts + a->size * a->nelts; -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.28.0/src/core/ngx_array.h 2016-04-19 09:02:38.000000000 -0700 -+++ nginx-1.28.0-patched/src/core/ngx_array.h 2016-04-21 16:25:07.453947190 -0700 +diff --minimal '--exclude=*.swp' '--exclude=*~' -up nginx-1.29.0/src/core/ngx_array.h nginx-1.29.0-patched/src/core/ngx_array.h +--- nginx-1.29.0/src/core/ngx_array.h 2016-04-19 09:02:38.000000000 -0700 ++++ nginx-1.29.0-patched/src/core/ngx_array.h 2016-04-21 16:25:07.453947190 -0700 @@ -13,12 +13,23 @@ #include @@ -195,9 +195,9 @@ diff --minimal '--exclude=*.swp' '--exclude=*~' -up nginx-1.28.0/src/core/ngx_ar array->elts = ngx_palloc(pool, n * size); if (array->elts == NULL) { -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.28.0/src/core/ngx_palloc.c 2016-04-19 09:02:38.000000000 -0700 -+++ nginx-1.28.0-patched/src/core/ngx_palloc.c 2016-04-21 16:25:45.912282685 -0700 +diff --minimal '--exclude=*.swp' '--exclude=*~' -up nginx-1.29.0/src/core/ngx_palloc.c nginx-1.29.0-patched/src/core/ngx_palloc.c +--- nginx-1.29.0/src/core/ngx_palloc.c 2016-04-19 09:02:38.000000000 -0700 ++++ nginx-1.29.0-patched/src/core/ngx_palloc.c 2016-04-21 16:25:45.912282685 -0700 @@ -9,34 +9,26 @@ #include @@ -546,9 +546,9 @@ diff --minimal '--exclude=*.swp' '--exclude=*~' -up nginx-1.28.0/src/core/ngx_pa return NGX_OK; } -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.28.0/src/core/ngx_palloc.h 2016-04-19 09:02:38.000000000 -0700 -+++ nginx-1.28.0-patched/src/core/ngx_palloc.h 2016-04-21 16:25:07.454949755 -0700 +diff --minimal '--exclude=*.swp' '--exclude=*~' -up nginx-1.29.0/src/core/ngx_palloc.h nginx-1.29.0-patched/src/core/ngx_palloc.h +--- nginx-1.29.0/src/core/ngx_palloc.h 2016-04-19 09:02:38.000000000 -0700 ++++ nginx-1.29.0-patched/src/core/ngx_palloc.h 2016-04-21 16:25:07.454949755 -0700 @@ -38,28 +38,21 @@ struct ngx_pool_cleanup_s { }; diff --git a/patches/nginx/1.28.0/nginx-1.28.0-pcre_conf_opt.patch b/patches/nginx/1.29.0/nginx-1.29.0-pcre_conf_opt.patch similarity index 100% rename from patches/nginx/1.28.0/nginx-1.28.0-pcre_conf_opt.patch rename to patches/nginx/1.29.0/nginx-1.29.0-pcre_conf_opt.patch diff --git a/patches/nginx/1.28.0/nginx-1.28.0-privileged_agent_process.patch b/patches/nginx/1.29.0/nginx-1.29.0-privileged_agent_process.patch similarity index 100% rename from patches/nginx/1.28.0/nginx-1.28.0-privileged_agent_process.patch rename to patches/nginx/1.29.0/nginx-1.29.0-privileged_agent_process.patch diff --git a/patches/nginx/1.28.0/nginx-1.28.0-privileged_agent_process_connections.patch b/patches/nginx/1.29.0/nginx-1.29.0-privileged_agent_process_connections.patch similarity index 100% rename from patches/nginx/1.28.0/nginx-1.28.0-privileged_agent_process_connections.patch rename to patches/nginx/1.29.0/nginx-1.29.0-privileged_agent_process_connections.patch diff --git a/patches/nginx/1.28.0/nginx-1.28.0-privileged_agent_process_thread_pool.patch b/patches/nginx/1.29.0/nginx-1.29.0-privileged_agent_process_thread_pool.patch similarity index 100% rename from patches/nginx/1.28.0/nginx-1.28.0-privileged_agent_process_thread_pool.patch rename to patches/nginx/1.29.0/nginx-1.29.0-privileged_agent_process_thread_pool.patch diff --git a/patches/nginx/1.28.0/nginx-1.28.0-proc_exit_handler.patch b/patches/nginx/1.29.0/nginx-1.29.0-proc_exit_handler.patch similarity index 100% rename from patches/nginx/1.28.0/nginx-1.28.0-proc_exit_handler.patch rename to patches/nginx/1.29.0/nginx-1.29.0-proc_exit_handler.patch diff --git a/patches/nginx/1.28.0/nginx-1.28.0-proxy_host_port_vars.patch b/patches/nginx/1.29.0/nginx-1.29.0-proxy_host_port_vars.patch similarity index 87% rename from patches/nginx/1.28.0/nginx-1.28.0-proxy_host_port_vars.patch rename to patches/nginx/1.29.0/nginx-1.29.0-proxy_host_port_vars.patch index 5b0d59e..65845bc 100644 --- a/patches/nginx/1.28.0/nginx-1.28.0-proxy_host_port_vars.patch +++ b/patches/nginx/1.29.0/nginx-1.29.0-proxy_host_port_vars.patch @@ -1,5 +1,5 @@ ---- nginx-1.28.0/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 +--- nginx-1.29.0/src/http/modules/ngx_http_proxy_module.c 2017-07-16 14:02:51.000000000 +0800 ++++ nginx-1.29.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 static ngx_http_variable_t ngx_http_proxy_vars[] = { diff --git a/patches/nginx/1.28.0/nginx-1.28.0-resolver_conf_parsing.patch b/patches/nginx/1.29.0/nginx-1.29.0-resolver_conf_parsing.patch similarity index 100% rename from patches/nginx/1.28.0/nginx-1.28.0-resolver_conf_parsing.patch rename to patches/nginx/1.29.0/nginx-1.29.0-resolver_conf_parsing.patch diff --git a/patches/nginx/1.28.0/nginx-1.28.0-reuseport_close_unused_fds.patch b/patches/nginx/1.29.0/nginx-1.29.0-reuseport_close_unused_fds.patch similarity index 100% rename from patches/nginx/1.28.0/nginx-1.28.0-reuseport_close_unused_fds.patch rename to patches/nginx/1.29.0/nginx-1.29.0-reuseport_close_unused_fds.patch diff --git a/patches/nginx/1.28.0/nginx-1.28.0-safe_resolver_ipv6_option.patch b/patches/nginx/1.29.0/nginx-1.29.0-safe_resolver_ipv6_option.patch similarity index 100% rename from patches/nginx/1.28.0/nginx-1.28.0-safe_resolver_ipv6_option.patch rename to patches/nginx/1.29.0/nginx-1.29.0-safe_resolver_ipv6_option.patch diff --git a/patches/nginx/1.28.0/nginx-1.28.0-server_header.patch b/patches/nginx/1.29.0/nginx-1.29.0-server_header.patch similarity index 98% rename from patches/nginx/1.28.0/nginx-1.28.0-server_header.patch rename to patches/nginx/1.29.0/nginx-1.29.0-server_header.patch index ae65fd5..2a9e910 100644 --- a/patches/nginx/1.28.0/nginx-1.28.0-server_header.patch +++ b/patches/nginx/1.29.0/nginx-1.29.0-server_header.patch @@ -5,7 +5,7 @@ index a3c0ef8..1263881 100644 @@ -11,7 +11,7 @@ #define nginx_version 1027001 - #define NGINX_VERSION "1.28.0" + #define NGINX_VERSION "1.29.0" -#define NGINX_VER "nginx/" NGINX_VERSION +#define NGINX_VER "openresty/" NGINX_VERSION ".unknown" diff --git a/patches/nginx/1.28.0/nginx-1.28.0-setting_args_invalidates_uri.patch b/patches/nginx/1.29.0/nginx-1.29.0-setting_args_invalidates_uri.patch similarity index 100% rename from patches/nginx/1.28.0/nginx-1.28.0-setting_args_invalidates_uri.patch rename to patches/nginx/1.29.0/nginx-1.29.0-setting_args_invalidates_uri.patch diff --git a/patches/nginx/1.28.0/nginx-1.28.0-single_process_graceful_exit.patch b/patches/nginx/1.29.0/nginx-1.29.0-single_process_graceful_exit.patch similarity index 100% rename from patches/nginx/1.28.0/nginx-1.28.0-single_process_graceful_exit.patch rename to patches/nginx/1.29.0/nginx-1.29.0-single_process_graceful_exit.patch diff --git a/patches/nginx/1.28.0/nginx-1.28.0-socket_cloexec.patch b/patches/nginx/1.29.0/nginx-1.29.0-socket_cloexec.patch similarity index 100% rename from patches/nginx/1.28.0/nginx-1.28.0-socket_cloexec.patch rename to patches/nginx/1.29.0/nginx-1.29.0-socket_cloexec.patch diff --git a/patches/nginx/1.28.0/nginx-1.28.0-ssl_cert_cb_yield.patch b/patches/nginx/1.29.0/nginx-1.29.0-ssl_cert_cb_yield.patch similarity index 100% rename from patches/nginx/1.28.0/nginx-1.28.0-ssl_cert_cb_yield.patch rename to patches/nginx/1.29.0/nginx-1.29.0-ssl_cert_cb_yield.patch diff --git a/patches/nginx/1.28.0/nginx-1.28.0-ssl_client_hello_cb_yield.patch b/patches/nginx/1.29.0/nginx-1.29.0-ssl_client_hello_cb_yield.patch similarity index 100% rename from patches/nginx/1.28.0/nginx-1.28.0-ssl_client_hello_cb_yield.patch rename to patches/nginx/1.29.0/nginx-1.29.0-ssl_client_hello_cb_yield.patch diff --git a/patches/nginx/1.28.0/nginx-1.28.0-ssl_sess_cb_yield.patch b/patches/nginx/1.29.0/nginx-1.29.0-ssl_sess_cb_yield.patch similarity index 100% rename from patches/nginx/1.28.0/nginx-1.28.0-ssl_sess_cb_yield.patch rename to patches/nginx/1.29.0/nginx-1.29.0-ssl_sess_cb_yield.patch diff --git a/patches/nginx/1.28.0/nginx-1.28.0-stream_balancer_export.patch b/patches/nginx/1.29.0/nginx-1.29.0-stream_balancer_export.patch similarity index 100% rename from patches/nginx/1.28.0/nginx-1.28.0-stream_balancer_export.patch rename to patches/nginx/1.29.0/nginx-1.29.0-stream_balancer_export.patch diff --git a/patches/nginx/1.28.0/nginx-1.28.0-stream_proxy_get_next_upstream_tries.patch b/patches/nginx/1.29.0/nginx-1.29.0-stream_proxy_get_next_upstream_tries.patch similarity index 100% rename from patches/nginx/1.28.0/nginx-1.28.0-stream_proxy_get_next_upstream_tries.patch rename to patches/nginx/1.29.0/nginx-1.29.0-stream_proxy_get_next_upstream_tries.patch diff --git a/patches/nginx/1.28.0/nginx-1.28.0-stream_proxy_protocol_v2.patch b/patches/nginx/1.29.0/nginx-1.29.0-stream_proxy_protocol_v2.patch similarity index 100% rename from patches/nginx/1.28.0/nginx-1.28.0-stream_proxy_protocol_v2.patch rename to patches/nginx/1.29.0/nginx-1.29.0-stream_proxy_protocol_v2.patch diff --git a/patches/nginx/1.28.0/nginx-1.28.0-stream_proxy_timeout_fields.patch b/patches/nginx/1.29.0/nginx-1.29.0-stream_proxy_timeout_fields.patch similarity index 100% rename from patches/nginx/1.28.0/nginx-1.28.0-stream_proxy_timeout_fields.patch rename to patches/nginx/1.29.0/nginx-1.29.0-stream_proxy_timeout_fields.patch diff --git a/patches/nginx/1.28.0/nginx-1.28.0-stream_ssl_preread_no_skip.patch b/patches/nginx/1.29.0/nginx-1.29.0-stream_ssl_preread_no_skip.patch similarity index 100% rename from patches/nginx/1.28.0/nginx-1.28.0-stream_ssl_preread_no_skip.patch rename to patches/nginx/1.29.0/nginx-1.29.0-stream_ssl_preread_no_skip.patch diff --git a/patches/nginx/1.28.0/nginx-1.28.0-upstream_pipelining.patch b/patches/nginx/1.29.0/nginx-1.29.0-upstream_pipelining.patch similarity index 100% rename from patches/nginx/1.28.0/nginx-1.28.0-upstream_pipelining.patch rename to patches/nginx/1.29.0/nginx-1.29.0-upstream_pipelining.patch diff --git a/patches/nginx/1.28.0/nginx-1.28.0-upstream_timeout_fields.patch b/patches/nginx/1.29.0/nginx-1.29.0-upstream_timeout_fields.patch similarity index 100% rename from patches/nginx/1.28.0/nginx-1.28.0-upstream_timeout_fields.patch rename to patches/nginx/1.29.0/nginx-1.29.0-upstream_timeout_fields.patch diff --git a/patches/nginx/1.28.0/nginx-1.28.0-win32_max_err_str.patch b/patches/nginx/1.29.0/nginx-1.29.0-win32_max_err_str.patch similarity index 100% rename from patches/nginx/1.28.0/nginx-1.28.0-win32_max_err_str.patch rename to patches/nginx/1.29.0/nginx-1.29.0-win32_max_err_str.patch diff --git a/util/sync-patches.sh b/util/sync-patches.sh index 9b64370..5cbe25d 100644 --- a/util/sync-patches.sh +++ b/util/sync-patches.sh @@ -17,10 +17,10 @@ old_pat=$(echo $old | sed 's/\./\\./g') topdir=`dirname $0` topdir="$topdir/.." -cd $topdir/patches +cd $topdir/patches/nginx if [ ! -d "$old" ]; then - echo "Error: patches/$old directory not found" + echo "Error: patches/nginx/$old directory not found" exit 1 fi