Mercurial > hg > nginx
comparison src/http/modules/ngx_http_fastcgi_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 |
---|---|
1909 ngx_http_script_compile_t sc; | 1909 ngx_http_script_compile_t sc; |
1910 ngx_http_script_copy_code_t *copy; | 1910 ngx_http_script_copy_code_t *copy; |
1911 | 1911 |
1912 if (conf->upstream.store != 0) { | 1912 if (conf->upstream.store != 0) { |
1913 ngx_conf_merge_value(conf->upstream.store, | 1913 ngx_conf_merge_value(conf->upstream.store, |
1914 prev->upstream.store, 0); | 1914 prev->upstream.store, 0); |
1915 | 1915 |
1916 if (conf->upstream.store_lengths == NULL) { | 1916 if (conf->upstream.store_lengths == NULL) { |
1917 conf->upstream.store_lengths = prev->upstream.store_lengths; | 1917 conf->upstream.store_lengths = prev->upstream.store_lengths; |
1918 conf->upstream.store_values = prev->upstream.store_values; | 1918 conf->upstream.store_values = prev->upstream.store_values; |
1919 } | 1919 } |
2539 ngx_http_fastcgi_loc_conf_t *flcf = conf; | 2539 ngx_http_fastcgi_loc_conf_t *flcf = conf; |
2540 | 2540 |
2541 ngx_str_t *value; | 2541 ngx_str_t *value; |
2542 ngx_http_script_compile_t sc; | 2542 ngx_http_script_compile_t sc; |
2543 | 2543 |
2544 if (flcf->upstream.store != NGX_CONF_UNSET || flcf->upstream.store_lengths) | 2544 if (flcf->upstream.store != NGX_CONF_UNSET |
2545 || flcf->upstream.store_lengths) | |
2545 { | 2546 { |
2546 return "is duplicate"; | 2547 return "is duplicate"; |
2547 } | 2548 } |
2548 | 2549 |
2549 value = cf->args->elts; | 2550 value = cf->args->elts; |