diff --git a/patches/nginx-1.2.1-location_if_inherits_proxy.patch b/patches/nginx-1.2.1-location_if_inherits_proxy.patch new file mode 100644 index 0000000..bc64510 --- /dev/null +++ b/patches/nginx-1.2.1-location_if_inherits_proxy.patch @@ -0,0 +1,15 @@ +--- nginx-1.2.1/src/http/modules/ngx_http_proxy_module.c 2012-04-23 18:40:01.000000000 +0800 ++++ nginx-1.2.1-patched/src/http/modules/ngx_http_proxy_module.c 2012-06-24 12:48:57.289834450 +0800 +@@ -3023,8 +3023,10 @@ + + if (conf->upstream.upstream || conf->proxy_lengths) { + clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module); +- if (clcf->handler == NULL && clcf->lmt_excpt) { +- clcf->handler = ngx_http_proxy_handler; ++ if (clcf->handler == NULL) { ++ if (clcf->lmt_excpt) { ++ clcf->handler = ngx_http_proxy_handler; ++ } + conf->location = prev->location; + } + } diff --git a/util/mirror-tarballs b/util/mirror-tarballs index 18d6429..e7b7ab1 100755 --- a/util/mirror-tarballs +++ b/util/mirror-tarballs @@ -85,6 +85,9 @@ patch -p1 < $root/patches/nginx-$main_ver-poll_del_event_at_exit.patch #patch -p1 < $root/patches/nginx-$main_ver-gzip_ok_invalid_read_fix.patch || exit 1 +echo applying location_if_inherits_proxy.patch ... +patch -p1 < $root/patches/nginx-$main_ver-location_if_inherits_proxy.patch + rm -f *.patch || exit 1 cd .. || exit 1