IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

style fix

Browse Source
This commit is contained in:
Igor Sysoev 2009-05-28 13:31:43 +00:00
parent da85fe6d5f
commit da28ef8bff
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/http/modules/ngx_http_fastcgi_module.c
View File

@ -1911,7 +1911,7 @@ ngx_http_fastcgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
if (conf->upstream.store != 0) {
ngx_conf_merge_value(conf->upstream.store,
prev->upstream.store, 0);
prev->upstream.store, 0);
if (conf->upstream.store_lengths == NULL) {
conf->upstream.store_lengths = prev->upstream.store_lengths;
@ -2541,7 +2541,8 @@ ngx_http_fastcgi_store(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
ngx_str_t *value;
ngx_http_script_compile_t sc;
if (flcf->upstream.store != NGX_CONF_UNSET || flcf->upstream.store_lengths)
if (flcf->upstream.store != NGX_CONF_UNSET
|| flcf->upstream.store_lengths)
{
return "is duplicate";
}

5
src/http/modules/ngx_http_proxy_module.c
View File

@ -1973,7 +1973,7 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
if (conf->upstream.store != 0) {
ngx_conf_merge_value(conf->upstream.store,
prev->upstream.store, 0);
prev->upstream.store, 0);
if (conf->upstream.store_lengths == NULL) {
conf->upstream.store_lengths = prev->upstream.store_lengths;
@ -2809,7 +2809,8 @@ ngx_http_proxy_store(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
ngx_str_t *value;
ngx_http_script_compile_t sc;
if (plcf->upstream.store != NGX_CONF_UNSET || plcf->upstream.store_lengths)
if (plcf->upstream.store != NGX_CONF_UNSET
|| plcf->upstream.store_lengths)
{
return "is duplicate";
}