mirror of
				https://github.com/openresty/openresty.git
				synced 2024-10-13 00:29:41 +00:00 
			
		
		
		
	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.
This commit is contained in:
		
				
					committed by
					
						
						Thibault Charbonnier
					
				
			
			
				
	
			
			
			
						parent
						
							6d7249f1c4
						
					
				
				
					commit
					268229af83
				
			@ -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;
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
@ -280,13 +280,6 @@ if [ "$answer" = "N" ]; then
 | 
				
			|||||||
    echo
 | 
					    echo
 | 
				
			||||||
fi
 | 
					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`
 | 
					answer=`$root/util/ver-ge "$main_ver" 1.5.3`
 | 
				
			||||||
if [ "$answer" = "N" ]; then
 | 
					if [ "$answer" = "N" ]; then
 | 
				
			||||||
    echo "$info_txt applying the unix_socket_accept_over_read patch for nginx $ver"
 | 
					    echo "$info_txt applying the unix_socket_accept_over_read patch for nginx $ver"
 | 
				
			||||||
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user