applied nginx-1.2.1-location_if_inherits_proxy.patch to the nginx core. see http://mailman.nginx.org/pipermail/nginx-devel/2012-June/002374.html for details.
This commit is contained in:
parent
8e363e3493
commit
1921477c18
|
@ -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;
|
||||||
|
}
|
||||||
|
}
|
|
@ -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
|
#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
|
rm -f *.patch || exit 1
|
||||||
|
|
||||||
cd .. || exit 1
|
cd .. || exit 1
|
||||||
|
|
Loading…
Reference in New Issue