Merge branch 'master' into patch-1.17.4-rc0

patches/nginx-1.17.4-gcc-maybe-uninitialized-warning.patch

@@ -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;
- 
- #if (NGX_SUPPRESS_WARN)
-     cscf = NULL;

util/configure

@@ -723,12 +723,11 @@ _END_
             $luajit_xcflags .= " -DLUAJIT_ENABLE_LUA52COMPAT";
         }
 
-        if (!$no_luajit_gc64
-            && $Config{"archname"} =~ /\bx86_64\b/
+        if ($no_luajit_gc64
             && (!$user_luajit_xcflags
-                || $user_luajit_xcflags !~ /-DLUAJIT_ENABLE_GC64\b/))
+                || $user_luajit_xcflags !~ /-DLUAJIT_DISABLE_GC64/))
         {
-            $luajit_xcflags .= " -DLUAJIT_ENABLE_GC64";
+            $luajit_xcflags .= " -DLUAJIT_DISABLE_GC64";
         }
 
         if (!$user_luajit_xcflags

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"