diff options
author | Igor Sysoev <igor@sysoev.ru> | 2008-09-01 14:05:20 +0000 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2008-09-01 14:05:20 +0000 |
commit | 0c16f73b4e376439a3fb6ae71e45b997cba9e971 (patch) | |
tree | 57f93fde27321228dd780402446c7322e530538a /src/http/ngx_http.c | |
parent | 63c78f3c34f75ec1b2e0df8daf28b7f356955b6d (diff) | |
download | nginx-0c16f73b4e376439a3fb6ae71e45b997cba9e971.tar.gz nginx-0c16f73b4e376439a3fb6ae71e45b997cba9e971.zip |
style fix: remove tabs and trailing spaces
Diffstat (limited to 'src/http/ngx_http.c')
-rw-r--r-- | src/http/ngx_http.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c index 492cfa065..7b109cace 100644 --- a/src/http/ngx_http.c +++ b/src/http/ngx_http.c @@ -1779,11 +1779,11 @@ ngx_http_merge_types(ngx_conf_t *cf, ngx_array_t *keys, ngx_hash_t *types_hash, if (prev_keys == NULL) { - if (ngx_http_set_default_types(cf, &prev_keys, default_types) + if (ngx_http_set_default_types(cf, &prev_keys, default_types) != NGX_OK) { - return NGX_CONF_ERROR; - } + return NGX_CONF_ERROR; + } } hash.hash = prev_types_hash; |