github.com/openresty
1
0
Fork 0
mirror of https://github.com/openresty/openresty synced 2025-02-18 18:09:35 +01:00
Code Releases Wiki Activity

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.

Browse Source
This commit is contained in:
agentzh (章亦春) 2012-06-24 20:43:10 +08:00
parent 8e363e3493
commit 1921477c18
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
patches/nginx-1.2.1-location_if_inherits_proxy.patch Normal file
View File

@ -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;
}
}

3
util/mirror-tarballs
View File

@ -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