diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2005-04-08 15:18:55 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2005-04-08 15:18:55 +0000 |
| commit | 02f742b45eb8792053d3880641f45651d645e351 (patch) | |
| tree | 1d5893bcc89c8f879712aa80f9a98a42f397e2c0 /src/http/modules/proxy/ngx_http_proxy_handler.c | |
| parent | 87ff72436d289ae7b72a23138262e6d156490927 (diff) | |
| download | nginx-02f742b45eb8792053d3880641f45651d645e351.tar.gz nginx-02f742b45eb8792053d3880641f45651d645e351.zip | |
nginx-0.1.28-RELEASE importrelease-0.1.28
*) Bugfix: nginx hogs CPU while proxying the huge files.
*) Bugfix: nginx could not be built by gcc 4.0 on Linux.
Diffstat (limited to 'src/http/modules/proxy/ngx_http_proxy_handler.c')
| -rw-r--r-- | src/http/modules/proxy/ngx_http_proxy_handler.c | 5 |
1 files changed, 5 insertions, 0 deletions
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; } |