diff options
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; |