Mercurial > hg > nginx

comparison src/http/ngx_http_core_module.c @ 2091:9f15e5f8ff9e stable-0.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
r2007, r2025, r2042 merge: style fixes
author Igor Sysoev <igor@sysoev.ru>
date Mon, 07 Jul 2008 10:18:41 +0000
parents dd388c80f5a2
children b9de93d804ea
comparison
equal deleted inserted replaced
2090:72b09c4dd8f7 2091:9f15e5f8ff9e
2920 prev->resolver = ngx_resolver_create(cf, NULL); 2920 prev->resolver = ngx_resolver_create(cf, NULL);
2921 if (prev->resolver == NULL) { 2921 if (prev->resolver == NULL) {
2922 return NGX_CONF_ERROR; 2922 return NGX_CONF_ERROR;
2923 } 2923 }
2924 } 2924 }
2925 2925
2926 conf->resolver = prev->resolver; 2926 conf->resolver = prev->resolver;
2927 } 2927 }
2928 2928
2929 ngx_conf_merge_path_value(conf->client_body_temp_path, 2929 ngx_conf_merge_path_value(conf->client_body_temp_path,
2930 prev->client_body_temp_path, 2930 prev->client_body_temp_path,