Mercurial > hg > nginx
comparison src/http/ngx_http_core_module.c @ 1906:4a8c9139e579
cleanup resolver
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Thu, 28 Feb 2008 20:38:34 +0000 |
parents | 4ca7c40af923 |
children | c0f873458e2b |
comparison
equal
deleted
inserted
replaced
1905:0cafbfd8112e | 1906:4a8c9139e579 |
---|---|
2908 | 2908 |
2909 if (conf->resolver == NULL) { | 2909 if (conf->resolver == NULL) { |
2910 conf->resolver = prev->resolver; | 2910 conf->resolver = prev->resolver; |
2911 | 2911 |
2912 if (conf->resolver == NULL) { | 2912 if (conf->resolver == NULL) { |
2913 conf->resolver = ngx_resolver_create(NULL, cf->cycle->new_log); | 2913 conf->resolver = ngx_resolver_create(cf->pool, NULL); |
2914 if (conf->resolver == NULL) { | 2914 if (conf->resolver == NULL) { |
2915 return NGX_CONF_ERROR; | 2915 return NGX_CONF_ERROR; |
2916 } | 2916 } |
2917 } | 2917 } |
2918 } | 2918 } |
3726 if (ngx_inet_resolve_host(cf->pool, &u) != NGX_OK) { | 3726 if (ngx_inet_resolve_host(cf->pool, &u) != NGX_OK) { |
3727 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "%V: %s", &u.host, u.err); | 3727 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "%V: %s", &u.host, u.err); |
3728 return NGX_CONF_ERROR; | 3728 return NGX_CONF_ERROR; |
3729 } | 3729 } |
3730 | 3730 |
3731 clcf->resolver = ngx_resolver_create(&u.addrs[0], cf->cycle->new_log); | 3731 clcf->resolver = ngx_resolver_create(cf->pool, &u.addrs[0]); |
3732 if (clcf->resolver == NULL) { | 3732 if (clcf->resolver == NULL) { |
3733 return NGX_OK; | 3733 return NGX_OK; |
3734 } | 3734 } |
3735 | 3735 |
3736 return NGX_CONF_OK; | 3736 return NGX_CONF_OK; |