diff options
| author | 2012-10-08 10:44:42 +0000 | |
|---|---|---|
| committer | 2012-10-08 10:44:42 +0000 | |
| commit | 808f7e3bb3f6a14beeff4727aba2133d4855f7bd (patch) | |
| tree | 83d7503f8998812362e0421412594cf22f1dbb37 /usr.sbin/nginx/src/core/ngx_resolver.c | |
| parent | deivce -> device (diff) | |
| download | wireguard-openbsd-808f7e3bb3f6a14beeff4727aba2133d4855f7bd.tar.xz wireguard-openbsd-808f7e3bb3f6a14beeff4727aba2133d4855f7bd.zip | |
update to 1.2.4
Diffstat (limited to 'usr.sbin/nginx/src/core/ngx_resolver.c')
| -rw-r--r-- | usr.sbin/nginx/src/core/ngx_resolver.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/usr.sbin/nginx/src/core/ngx_resolver.c b/usr.sbin/nginx/src/core/ngx_resolver.c index 3e75e05a378..178e0831d56 100644 --- a/usr.sbin/nginx/src/core/ngx_resolver.c +++ b/usr.sbin/nginx/src/core/ngx_resolver.c @@ -113,15 +113,6 @@ ngx_resolver_create(ngx_conf_t *cf, ngx_str_t *names, ngx_uint_t n) return NULL; } - if (n) { - if (ngx_array_init(&r->udp_connections, cf->pool, n, - sizeof(ngx_udp_connection_t)) - != NGX_OK) - { - return NULL; - } - } - cln->data = r; r->event = ngx_calloc(sizeof(ngx_event_t), cf->log); @@ -153,6 +144,15 @@ ngx_resolver_create(ngx_conf_t *cf, ngx_str_t *names, ngx_uint_t n) r->log = &cf->cycle->new_log; r->log_level = NGX_LOG_ERR; + if (n) { + if (ngx_array_init(&r->udp_connections, cf->pool, n, + sizeof(ngx_udp_connection_t)) + != NGX_OK) + { + return NULL; + } + } + for (i = 0; i < n; i++) { if (ngx_strncmp(names[i].data, "valid=", 6) == 0) { s.len = names[i].len - 6; |
