# HG changeset patch
# User Igor Sysoev <igor@sysoev.ru>
# Date 1280840354 0
# Node ID e3a6785b5be43dafa0bbf61fea64f1a8c6344a92
# Parent  527a0f8cae2ae015d8aef242b70d851bb10b0157
*) make code consistent to fastcgi, etc
*) remove STUB comment

diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c
--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -1986,12 +1986,6 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t
         }
     }
 
-    /* STUB */
-    if (prev->proxy_lengths) {
-        conf->proxy_lengths = prev->proxy_lengths;
-        conf->proxy_values = prev->proxy_values;
-    }
-
 #if (NGX_HTTP_SSL)
     if (conf->upstream.ssl == NULL) {
         conf->upstream.ssl = prev->upstream.ssl;
@@ -2023,6 +2017,11 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t
         conf->vars = prev->vars;
     }
 
+    if (conf->proxy_lengths == NULL) {
+        conf->proxy_lengths = prev->proxy_lengths;
+        conf->proxy_values = prev->proxy_values;
+    }
+
     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) {