Mercurial > hg > nginx-quic
comparison src/http/ngx_http_core_module.c @ 1919:dc0f5013f674
create dummy resolver in http context to inherit it in all servers
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Thu, 06 Mar 2008 08:48:55 +0000 |
parents | 91879041b681 |
children | c72fe0a8d9b4 |
comparison
equal
deleted
inserted
replaced
1918:a47516c7065b | 1919:dc0f5013f674 |
---|---|
2906 prev->lingering_timeout, 5000); | 2906 prev->lingering_timeout, 5000); |
2907 ngx_conf_merge_msec_value(conf->resolver_timeout, | 2907 ngx_conf_merge_msec_value(conf->resolver_timeout, |
2908 prev->resolver_timeout, 30000); | 2908 prev->resolver_timeout, 30000); |
2909 | 2909 |
2910 if (conf->resolver == NULL) { | 2910 if (conf->resolver == NULL) { |
2911 conf->resolver = prev->resolver; | 2911 |
2912 | 2912 if (prev->resolver == NULL) { |
2913 if (conf->resolver == NULL) { | 2913 |
2914 conf->resolver = ngx_resolver_create(cf, NULL); | 2914 /* |
2915 if (conf->resolver == NULL) { | 2915 * create dummy resolver in http {} context |
2916 * to inherit it in all servers | |
2917 */ | |
2918 | |
2919 prev->resolver = ngx_resolver_create(cf, NULL); | |
2920 if (prev->resolver == NULL) { | |
2916 return NGX_CONF_ERROR; | 2921 return NGX_CONF_ERROR; |
2917 } | 2922 } |
2918 } | 2923 } |
2924 | |
2925 conf->resolver = prev->resolver; | |
2919 } | 2926 } |
2920 | 2927 |
2921 ngx_conf_merge_path_value(conf->client_body_temp_path, | 2928 ngx_conf_merge_path_value(conf->client_body_temp_path, |
2922 prev->client_body_temp_path, | 2929 prev->client_body_temp_path, |
2923 NGX_HTTP_CLIENT_TEMP_PATH, 0, 0, 0, | 2930 NGX_HTTP_CLIENT_TEMP_PATH, 0, 0, 0, |
3715 ngx_http_core_loc_conf_t *clcf = conf; | 3722 ngx_http_core_loc_conf_t *clcf = conf; |
3716 | 3723 |
3717 ngx_url_t u; | 3724 ngx_url_t u; |
3718 ngx_str_t *value; | 3725 ngx_str_t *value; |
3719 | 3726 |
3727 if (clcf->resolver) { | |
3728 return "is duplicate"; | |
3729 } | |
3730 | |
3720 value = cf->args->elts; | 3731 value = cf->args->elts; |
3721 | 3732 |
3722 ngx_memzero(&u, sizeof(ngx_url_t)); | 3733 ngx_memzero(&u, sizeof(ngx_url_t)); |
3723 | 3734 |
3724 u.host = value[1]; | 3735 u.host = value[1]; |