Mercurial > hg > nginx

comparison src/http/ngx_http_core_module.c @ 440:f390d1775430

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx-0.1.0-2004-09-27-20:03:21 import
author Igor Sysoev <igor@sysoev.ru>
date Mon, 27 Sep 2004 16:03:21 +0000
parents 4fe393d82f44
children da8c5707af39
comparison
equal deleted inserted replaced
439:4fe393d82f44 440:f390d1775430
1413 1413
1414 int i, key; 1414 int i, key;
1415 ngx_http_type_t *t; 1415 ngx_http_type_t *t;
1416 1416
1417 ngx_conf_merge_str_value(conf->root, prev->root, "html"); 1417 ngx_conf_merge_str_value(conf->root, prev->root, "html");
1418
1419 if (ngx_conf_full_name(cf->cycle, &conf->root) == NGX_ERROR) {
1420 return NGX_CONF_ERROR;
1421 }
1418 1422
1419 if (conf->types == NULL) { 1423 if (conf->types == NULL) {
1420 if (prev->types) { 1424 if (prev->types) {
1421 conf->types = prev->types; 1425 conf->types = prev->types;
1422 1426