nginx: apply the resolver_del_event_invalid_read patch to nginx 1.7.5+ by default.

agentzh · agentzh · commit 38dc36353db2 · 2014-09-30T16:01:58.000-07:00
diff --git a/ngx-build b/ngx-build
@@ -401,6 +401,10 @@ sub apply_patches {
         shell("patch -p1 < $root/../ngx_openresty/patches/nginx-$version-geoip_init_var_fields.patch");
         chdir ".." or die "cannot switch to ..\n";
     }
+
+    chdir "nginx-$version" or die "cannot switch to nginx-$version\n";
+    shell("patch -p1 < $root/../ngx_openresty/patches/nginx-$version-resolver_del_event_invalid_read.patch");
+    chdir ".." or die "cannot switch to ..\n";
 }
 
 sub usage {

Original file line number	Diff line number	Diff line change
`@@ -401,6 +401,10 @@ sub apply_patches {`
`401`	`401`	`shell("patch -p1 < $root/../ngx_openresty/patches/nginx-$version-geoip_init_var_fields.patch");`
`402`	`402`	`chdir ".." or die "cannot switch to ..\n";`
`403`	`403`	`}`
	`404`	`+`
	`405`	`+ chdir "nginx-$version" or die "cannot switch to nginx-$version\n";`
	`406`	`+ shell("patch -p1 < $root/../ngx_openresty/patches/nginx-$version-resolver_del_event_invalid_read.patch");`
	`407`	`+ chdir ".." or die "cannot switch to ..\n";`
`404`	`408`	`}`
`405`	`409`
`406`	`410`	`sub usage {`