# HG changeset patch # User Igor Sysoev # Date 1220277920 0 # Node ID 005fc65f7ce7f8409c614c3e5eec0bdb81b84598 # Parent d200fbe9aa811dd3d79cd8b791dbea8eb3a332ef style fix: remove tabs and trailing spaces diff --git a/src/http/modules/ngx_http_fastcgi_module.c b/src/http/modules/ngx_http_fastcgi_module.c --- a/src/http/modules/ngx_http_fastcgi_module.c +++ b/src/http/modules/ngx_http_fastcgi_module.c @@ -1170,7 +1170,7 @@ ngx_http_fastcgi_process_header(ngx_http u->headers_in.status_line.len = sizeof("302 Moved Temporarily") - 1; u->headers_in.status_line.data = - (u_char *) "302 Moved Temporarily"; + (u_char *) "302 Moved Temporarily"; } else { u->headers_in.status_n = 200; diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c --- 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 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;