Mercurial > hg > nginx

comparison src/http/ngx_http_core_module.c @ 1683:1e0b028055ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
allow to use IP addresses without defined resolver
author Igor Sysoev <igor@sysoev.ru>
date Mon, 03 Dec 2007 10:05:19 +0000
parents c74e7fd0bcaf
children e584e946e198
comparison
equal deleted inserted replaced
1682:85523506e427 1683:1e0b028055ec
2592 ngx_conf_merge_msec_value(conf->resolver_timeout, 2592 ngx_conf_merge_msec_value(conf->resolver_timeout,
2593 prev->resolver_timeout, 30000); 2593 prev->resolver_timeout, 30000);
2594 2594
2595 if (conf->resolver == NULL) { 2595 if (conf->resolver == NULL) {
2596 conf->resolver = prev->resolver; 2596 conf->resolver = prev->resolver;
2597
2598 if (conf->resolver == NULL) {
2599 conf->resolver = ngx_resolver_create(NULL, cf->cycle->new_log);
2600 if (conf->resolver == NULL) {
2601 return NGX_OK;
2602 }
2603 }
2597 } 2604 }
2598 2605
2599 ngx_conf_merge_path_value(conf->client_body_temp_path, 2606 ngx_conf_merge_path_value(conf->client_body_temp_path,
2600 prev->client_body_temp_path, 2607 prev->client_body_temp_path,
2601 NGX_HTTP_CLIENT_TEMP_PATH, 0, 0, 0, 2608 NGX_HTTP_CLIENT_TEMP_PATH, 0, 0, 0,