diff --git a/ngx-build b/ngx-build index dc3bec1..334f6cf 100755 --- a/ngx-build +++ b/ngx-build @@ -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"); @@ -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 {