From 268229af83463b3e1da46d9527b8f2369c35240d Mon Sep 17 00:00:00 2001 From: Thibault Charbonnier Date: Mon, 20 Jan 2020 15:26:42 -0800 Subject: [PATCH] misc: removed the gcc-maybe-uninitialized-warning patch. This was fixed in the 1.5.10 release. We unconditionally remove it since we only support NGINX cores 1.6.0 and above. --- ...nginx-1.17.4-gcc-maybe-uninitialized-warning.patch | 11 ----------- util/mirror-tarballs | 7 ------- 2 files changed, 18 deletions(-) delete mode 100644 patches/nginx-1.17.4-gcc-maybe-uninitialized-warning.patch diff --git a/patches/nginx-1.17.4-gcc-maybe-uninitialized-warning.patch b/patches/nginx-1.17.4-gcc-maybe-uninitialized-warning.patch deleted file mode 100644 index bb1de01..0000000 --- a/patches/nginx-1.17.4-gcc-maybe-uninitialized-warning.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- nginx-1.17.4/src/http/ngx_http_request.c 2013-05-06 03:26:50.000000000 -0700 -+++ nginx-1.17.4-patched/src/http/ngx_http_request.c 2013-06-11 12:59:48.008321688 -0700 -@@ -1951,7 +1951,7 @@ - ngx_int_t rc; - ngx_http_connection_t *hc; - ngx_http_core_loc_conf_t *clcf; -- ngx_http_core_srv_conf_t *cscf; -+ ngx_http_core_srv_conf_t *cscf = NULL; - - hc = r->http_connection; - diff --git a/util/mirror-tarballs b/util/mirror-tarballs index ea91d79..cc142d6 100755 --- a/util/mirror-tarballs +++ b/util/mirror-tarballs @@ -280,13 +280,6 @@ if [ "$answer" = "N" ]; then echo fi -answer=`$root/util/ver-ge "$main_ver" 1.4.1` -if [ "$answer" = "Y" ]; then - echo "$info_txt applying patches/nginx-$main_ver-gcc-maybe-uninitialized-warning.patch for nginx" - patch -p1 < $root/patches/nginx-$main_ver-gcc-maybe-uninitialized-warning.patch - echo -fi - answer=`$root/util/ver-ge "$main_ver" 1.5.3` if [ "$answer" = "N" ]; then echo "$info_txt applying the unix_socket_accept_over_read patch for nginx $ver"