Mercurial > hg > nginx

diff src/http/modules/proxy/ngx_http_proxy_handler.c @ 507:cd3117ad9aab release-0.1.28

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Igor Sysoev <igor@sysoev.ru>
date Fri, 08 Apr 2005 15:18:55 +0000
parents ee66921ecd47
children 9b8c906f6e63
line wrap: on
line diff
--- 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_co
         conf->x_vars = prev->x_vars;
     }
 
+    if (conf->peers == NULL) {
+        conf->peers = prev->peers;
+        conf->upstream = prev->upstream;
+    }
+
     return NULL;
 }