Mercurial > hg > nginx-quic
comparison src/http/modules/ngx_http_proxy_module.c @ 2894:d26f4e80c71f
style fix
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Thu, 28 May 2009 13:31:43 +0000 |
parents | 6e1941b321b7 |
children | d65e58a8d3a4 |
comparison
equal
deleted
inserted
replaced
2893:da1ba8a5c8c9 | 2894:d26f4e80c71f |
---|---|
1971 ngx_http_proxy_redirect_t *pr; | 1971 ngx_http_proxy_redirect_t *pr; |
1972 ngx_http_script_compile_t sc; | 1972 ngx_http_script_compile_t sc; |
1973 | 1973 |
1974 if (conf->upstream.store != 0) { | 1974 if (conf->upstream.store != 0) { |
1975 ngx_conf_merge_value(conf->upstream.store, | 1975 ngx_conf_merge_value(conf->upstream.store, |
1976 prev->upstream.store, 0); | 1976 prev->upstream.store, 0); |
1977 | 1977 |
1978 if (conf->upstream.store_lengths == NULL) { | 1978 if (conf->upstream.store_lengths == NULL) { |
1979 conf->upstream.store_lengths = prev->upstream.store_lengths; | 1979 conf->upstream.store_lengths = prev->upstream.store_lengths; |
1980 conf->upstream.store_values = prev->upstream.store_values; | 1980 conf->upstream.store_values = prev->upstream.store_values; |
1981 } | 1981 } |
2807 ngx_http_proxy_loc_conf_t *plcf = conf; | 2807 ngx_http_proxy_loc_conf_t *plcf = conf; |
2808 | 2808 |
2809 ngx_str_t *value; | 2809 ngx_str_t *value; |
2810 ngx_http_script_compile_t sc; | 2810 ngx_http_script_compile_t sc; |
2811 | 2811 |
2812 if (plcf->upstream.store != NGX_CONF_UNSET || plcf->upstream.store_lengths) | 2812 if (plcf->upstream.store != NGX_CONF_UNSET |
2813 || plcf->upstream.store_lengths) | |
2813 { | 2814 { |
2814 return "is duplicate"; | 2815 return "is duplicate"; |
2815 } | 2816 } |
2816 | 2817 |
2817 value = cf->args->elts; | 2818 value = cf->args->elts; |