186526/openresty
1
0
Fork 0
mirror of https://github.com/openresty/openresty.git synced 2024-10-13 00:29:41 +00:00
Code Issues Projects Releases Wiki Activity

upgraded the nginx core to 1.2.6.

Browse Source
This commit is contained in:
agentzh (Yichun Zhang)
2012-12-23 17:54:00 -08:00
parent a841caaff8
commit f2b37bbcc7
14 changed files with 2366 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1,15 @@
--- nginx-1.2.6/src/http/modules/ngx_http_proxy_module.c 2012-04-23 18:40:01.000000000 +0800
+++ nginx-1.2.6-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;
}
}