From 02f742b45eb8792053d3880641f45651d645e351 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Fri, 8 Apr 2005 15:18:55 +0000 Subject: nginx-0.1.28-RELEASE import *) Bugfix: nginx hogs CPU while proxying the huge files. *) Bugfix: nginx could not be built by gcc 4.0 on Linux. --- src/http/modules/proxy/ngx_http_proxy_handler.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/http/modules/proxy') diff --git a/src/http/modules/proxy/ngx_http_proxy_handler.c b/src/http/modules/proxy/ngx_http_proxy_handler.c index 9addfc23a..12d417176 100644 --- a/src/http/modules/proxy/ngx_http_proxy_handler.c +++ b/src/http/modules/proxy/ngx_http_proxy_handler.c @@ -1332,6 +1332,11 @@ static char *ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, conf->x_vars = prev->x_vars; } + if (conf->peers == NULL) { + conf->peers = prev->peers; + conf->upstream = prev->upstream; + } + return NULL; } -- cgit v1.2.3