Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

ngx-build: exclude those patches already merged into nginx 1.3.4.

  • Loading branch information...
commit 1dfefb472f6471e430ac56f6fd7be14d6e61c4c0 1 parent 2608a19
@agentzh agentzh authored
Showing with 5 additions and 3 deletions.
  1. +5 −3 ngx-build
View
8 ngx-build
@@ -205,11 +205,13 @@ sub apply_patches {
shell("patch -p0 < $root/../ngx_openresty/patches/nginx-$version-filter_finalize_hang.patch");
}
- shell("patch -p0 < $root/../ngx_openresty/patches/nginx-$version-add_core_vars_polluting_globals.patch");
+ unless ($ver ge '001003004') {
+ shell("patch -p0 < $root/../ngx_openresty/patches/nginx-$version-add_core_vars_polluting_globals.patch");
- shell("patch -p0 < $root/../ngx_openresty/patches/nginx-$version-resolver_debug_log_overflow.patch");
+ shell("patch -p0 < $root/../ngx_openresty/patches/nginx-$version-resolver_debug_log_overflow.patch");
- shell("patch -p0 < $root/../ngx_openresty/patches/nginx-$version-poll_del_event_at_exit.patch");
+ shell("patch -p0 < $root/../ngx_openresty/patches/nginx-$version-poll_del_event_at_exit.patch");
+ }
shell("patch -p0 < $root/../ngx_openresty/patches/nginx-$version-location_if_inherits_proxy.patch");
Please sign in to comment.
Something went wrong with that request. Please try again.