Fijxu/nginx-quic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

style fix

Browse source
This commit is contained in:
Igor Sysoev 2009-05-28 13:31:43 +00:00
parent 791c447d29
commit 7b26e45205
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) { if (conf->upstream.store != 0) {
ngx_conf_merge_value(conf->upstream.store, ngx_conf_merge_value(conf->upstream.store,
prev->upstream.store, 0); prev->upstream.store, 0);
if (conf->upstream.store_lengths == NULL) { if (conf->upstream.store_lengths == NULL) {
conf->upstream.store_lengths = prev->upstream.store_lengths; 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_str_t *value;
ngx_http_script_compile_t sc; 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"; 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) { if (conf->upstream.store != 0) {
ngx_conf_merge_value(conf->upstream.store, ngx_conf_merge_value(conf->upstream.store,
prev->upstream.store, 0); prev->upstream.store, 0);
if (conf->upstream.store_lengths == NULL) { if (conf->upstream.store_lengths == NULL) {
conf->upstream.store_lengths = prev->upstream.store_lengths; 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_str_t *value;
ngx_http_script_compile_t sc; 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"; return "is duplicate";
} }