Skip to content

Commit 3ff778f

Browse files
committed
ngx-build: disabled already-merged patches for nginx 1.7.4+.
1 parent d0607b9 commit 3ff778f

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

ngx-build

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -392,9 +392,15 @@ sub apply_patches {
392392
chdir ".." or die "cannot switch to ..\n";
393393
}
394394

395-
chdir "nginx-$version" or die "cannot switch to nginx-$version\n";
396-
shell("patch -p1 < $root/../ngx_openresty/patches/nginx-$version-proxy_ssl_handshake_timer.patch");
397-
chdir ".." or die "cannot switch to ..\n";
395+
unless ($ver ge '001007004') {
396+
chdir "nginx-$version" or die "cannot switch to nginx-$version\n";
397+
shell("patch -p1 < $root/../ngx_openresty/patches/nginx-$version-proxy_ssl_handshake_timer.patch");
398+
chdir ".." or die "cannot switch to ..\n";
399+
400+
chdir "nginx-$version" or die "cannot switch to nginx-$version\n";
401+
shell("patch -p1 < $root/../ngx_openresty/patches/nginx-$version-geoip_init_var_fields.patch");
402+
chdir ".." or die "cannot switch to ..\n";
403+
}
398404
}
399405

400406
sub usage {

0 commit comments

Comments
 (0)