Mercurial > hg > nginx-quic

comparison src/http/ngx_http_core_module.c @ 1913:c0f873458e2b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use cf->cycle->new_log because at merge stage cf->pool->log is old log
author Igor Sysoev <igor@sysoev.ru>
date Tue, 04 Mar 2008 10:42:05 +0000
parents 4a8c9139e579
children 91879041b681
comparison
equal deleted inserted replaced
1912:68b426b43c31 1913:c0f873458e2b
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(cf->pool, NULL); 2913 conf->resolver = ngx_resolver_create(cf, 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(cf->pool, &u.addrs[0]); 3731 clcf->resolver = ngx_resolver_create(cf, &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;