Skip to content

Commit

Permalink
ngx-build: skipped the patches that have already been applied to ngin…
Browse files Browse the repository at this point in the history
…x 1.5.3+.
  • Loading branch information
agentzh committed Aug 30, 2013
1 parent 08d282a commit 6bd38f9
Showing 1 changed file with 12 additions and 4 deletions.
16 changes: 12 additions & 4 deletions ngx-build
Expand Up @@ -274,13 +274,17 @@ sub apply_patches {
shell("patch -p0 < $root/../ngx_openresty/patches/nginx-$version-log_escape_non_ascii.patch");
}

shell("patch -p0 < $root/../ngx_openresty/patches/nginx-$version-upstream_truncation.patch");
unless ($ver ge '001005003') {
shell("patch -p0 < $root/../ngx_openresty/patches/nginx-$version-upstream_truncation.patch");
}

chdir "nginx-$version" or die "cannot switch to nginx-$version\n";
shell("patch -p1 < $root/../ngx_openresty/patches/nginx-$version-dtrace.patch");
chdir ".." or die "cannot switch to ..\n";

shell("patch -p0 < $root/../ngx_openresty/patches/nginx-$version-channel-uninit-params.patch");
unless ($ver ge '001005003') {
shell("patch -p0 < $root/../ngx_openresty/patches/nginx-$version-channel-uninit-params.patch");
}

unless ($ver ge '001002006') {
shell("patch -p0 < $root/../ngx_openresty/patches/nginx-$version-upstream_test_connect_kqueue.patch");
Expand Down Expand Up @@ -315,13 +319,17 @@ sub apply_patches {
}

#warn "applying the invalid_referer_hash patch...\n";
shell("patch -p0 < $root/../ngx_openresty/patches/nginx-$version-invalid_referer_hash.patch");
unless ($ver ge '001005003') {
shell("patch -p0 < $root/../ngx_openresty/patches/nginx-$version-invalid_referer_hash.patch");
}

if ($ver ge '001004001') {
shell("patch -p0 < $root/../ngx_openresty/patches/nginx-$version-gcc-maybe-uninitialized-warning.patch");
}

shell("patch -p0 < $root/../ngx_openresty/patches/nginx-$version-unix_socket_accept_over_read.patch");
unless ($ver ge '001005003') {
shell("patch -p0 < $root/../ngx_openresty/patches/nginx-$version-unix_socket_accept_over_read.patch");
}
}

sub usage {
Expand Down

0 comments on commit 6bd38f9

Please sign in to comment.