use pool instead of ngx_conf_t
diff --git a/src/core/ngx_inet.c b/src/core/ngx_inet.c
index 31094ba..5595d7c 100644
--- a/src/core/ngx_inet.c
+++ b/src/core/ngx_inet.c
@@ -225,7 +225,7 @@
ngx_int_t
-ngx_parse_url(ngx_conf_t *cf, ngx_url_t *u)
+ngx_parse_url(ngx_pool_t *pool, ngx_url_t *u)
{
u_char *p, *host, *port_start;
size_t len, port_len;
@@ -273,12 +273,12 @@
return NGX_ERROR;
}
- u->addrs = ngx_pcalloc(cf->pool, sizeof(ngx_peer_addr_t));
+ u->addrs = ngx_pcalloc(pool, sizeof(ngx_peer_addr_t));
if (u->addrs == NULL) {
return NGX_ERROR;
}
- saun = ngx_pcalloc(cf->pool, sizeof(struct sockaddr_un));
+ saun = ngx_pcalloc(pool, sizeof(struct sockaddr_un));
if (saun == NULL) {
return NGX_ERROR;
}
@@ -408,12 +408,12 @@
if (u->host.len) {
- host = ngx_palloc(cf->temp_pool, u->host.len + 1);
- if (host == NULL) {
- return NGX_ERROR;
- }
+ host = ngx_alloc(u->host.len + 1, pool->log);
+ if (host == NULL) {
+ return NGX_ERROR;
+ }
- (void) ngx_cpystrn(host, u->host.data, u->host.len + 1);
+ (void) ngx_cpystrn(host, u->host.data, u->host.len + 1);
u->addr.in_addr = inet_addr((const char *) host);
@@ -421,6 +421,7 @@
h = gethostbyname((const char *) host);
if (h == NULL || h->h_addr_list[0] == NULL) {
+ ngx_free(host);
u->err = "host not found";
return NGX_ERROR;
}
@@ -428,6 +429,8 @@
u->addr.in_addr = *(in_addr_t *) (h->h_addr_list[0]);
}
+ ngx_free(host);
+
} else {
u->addr.in_addr = INADDR_ANY;
}
@@ -453,7 +456,7 @@
return NGX_ERROR;
}
- if (ngx_inet_resolve_host(cf, u) != NGX_OK) {
+ if (ngx_inet_resolve_host(pool, u) != NGX_OK) {
return NGX_ERROR;
}
@@ -462,7 +465,7 @@
ngx_int_t
-ngx_inet_resolve_host(ngx_conf_t *cf, ngx_url_t *u)
+ngx_inet_resolve_host(ngx_pool_t *pool, ngx_url_t *u)
{
u_char *p, *host;
size_t len;
@@ -471,7 +474,7 @@
struct hostent *h;
struct sockaddr_in *sin;
- host = ngx_palloc(cf->temp_pool, u->host.len + 1);
+ host = ngx_alloc(u->host.len + 1, pool->log);
if (host == NULL) {
return NGX_ERROR;
}
@@ -485,6 +488,8 @@
if (in_addr == INADDR_NONE) {
h = gethostbyname((char *) host);
+ ngx_free(host);
+
if (h == NULL || h->h_addr_list[0] == NULL) {
u->err = "host not found";
return NGX_ERROR;
@@ -499,7 +504,7 @@
/* MP: ngx_shared_palloc() */
- u->addrs = ngx_pcalloc(cf->pool, i * sizeof(ngx_peer_addr_t));
+ u->addrs = ngx_pcalloc(pool, i * sizeof(ngx_peer_addr_t));
if (u->addrs == NULL) {
return NGX_ERROR;
}
@@ -508,7 +513,7 @@
for (i = 0; h->h_addr_list[i] != NULL; i++) {
- sin = ngx_pcalloc(cf->pool, sizeof(struct sockaddr_in));
+ sin = ngx_pcalloc(pool, sizeof(struct sockaddr_in));
if (sin == NULL) {
return NGX_ERROR;
}
@@ -522,7 +527,7 @@
len = INET_ADDRSTRLEN - 1 + 1 + sizeof(":65536") - 1;
- p = ngx_palloc(cf->pool, len);
+ p = ngx_palloc(pool, len);
if (p == NULL) {
return NGX_ERROR;
}
@@ -535,14 +540,16 @@
} else {
+ ngx_free(host);
+
/* MP: ngx_shared_palloc() */
- u->addrs = ngx_pcalloc(cf->pool, sizeof(ngx_peer_addr_t));
+ u->addrs = ngx_pcalloc(pool, sizeof(ngx_peer_addr_t));
if (u->addrs == NULL) {
return NGX_ERROR;
}
- sin = ngx_pcalloc(cf->pool, sizeof(struct sockaddr_in));
+ sin = ngx_pcalloc(pool, sizeof(struct sockaddr_in));
if (sin == NULL) {
return NGX_ERROR;
}
@@ -556,7 +563,7 @@
u->addrs[0].sockaddr = (struct sockaddr *) sin;
u->addrs[0].socklen = sizeof(struct sockaddr_in);
- p = ngx_palloc(cf->pool, u->host.len + sizeof(":65536") - 1);
+ p = ngx_palloc(pool, u->host.len + sizeof(":65536") - 1);
if (p == NULL) {
return NGX_ERROR;
}
diff --git a/src/core/ngx_inet.h b/src/core/ngx_inet.h
index 9079e37..a3d624e 100644
--- a/src/core/ngx_inet.h
+++ b/src/core/ngx_inet.h
@@ -61,8 +61,8 @@
size_t ngx_sock_ntop(int family, struct sockaddr *sa, u_char *text, size_t len);
size_t ngx_inet_ntop(int family, void *addr, u_char *text, size_t len);
ngx_int_t ngx_ptocidr(ngx_str_t *text, void *cidr);
-ngx_int_t ngx_parse_url(ngx_conf_t *cf, ngx_url_t *u);
-ngx_int_t ngx_inet_resolve_host(ngx_conf_t *cf, ngx_url_t *u);
+ngx_int_t ngx_parse_url(ngx_pool_t *pool, ngx_url_t *u);
+ngx_int_t ngx_inet_resolve_host(ngx_pool_t *pool, ngx_url_t *u);
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index a99fbca..462393b 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -2607,7 +2607,7 @@
u.listen = 1;
u.default_port = 80;
- if (ngx_parse_url(cf, &u) != NGX_OK) {
+ if (ngx_parse_url(cf->pool, &u) != NGX_OK) {
if (u.err) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"%s in \"%V\" of the \"listen\" directive",
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 88cae8f..88b0084 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -3065,7 +3065,7 @@
u.url = value[1];
u.default_port = 80;
- if (ngx_parse_url(cf, &u) != NGX_OK) {
+ if (ngx_parse_url(cf->pool, &u) != NGX_OK) {
if (u.err) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"%s in upstream \"%V\"", u.err, &u.url);
@@ -3180,7 +3180,7 @@
if (!(flags & NGX_HTTP_UPSTREAM_CREATE)) {
- if (ngx_parse_url(cf, u) != NGX_OK) {
+ if (ngx_parse_url(cf->pool, u) != NGX_OK) {
if (u->err) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"%s in upstream \"%V\"", u->err, &u->url);
diff --git a/src/http/ngx_http_upstream_round_robin.c b/src/http/ngx_http_upstream_round_robin.c
index 5caf060..a2b269d 100644
--- a/src/http/ngx_http_upstream_round_robin.c
+++ b/src/http/ngx_http_upstream_round_robin.c
@@ -145,7 +145,7 @@
u.host = us->host;
u.port = (in_port_t) (us->port ? us->port : us->default_port);
- if (ngx_inet_resolve_host(cf, &u) != NGX_OK) {
+ if (ngx_inet_resolve_host(cf->pool, &u) != NGX_OK) {
if (u.err) {
ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
"%s in upstream \"%V\" in %s:%ui",
diff --git a/src/mail/ngx_mail_auth_http_module.c b/src/mail/ngx_mail_auth_http_module.c
index 9e74e6a..0bde162 100644
--- a/src/mail/ngx_mail_auth_http_module.c
+++ b/src/mail/ngx_mail_auth_http_module.c
@@ -1368,7 +1368,7 @@
u.url.data += 7;
}
- if (ngx_parse_url(cf, &u) != NGX_OK) {
+ if (ngx_parse_url(cf->pool, &u) != NGX_OK) {
if (u.err) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"%s in auth_http \"%V\"", u.err, &u.url);
diff --git a/src/mail/ngx_mail_core_module.c b/src/mail/ngx_mail_core_module.c
index 9652330..4f13703 100644
--- a/src/mail/ngx_mail_core_module.c
+++ b/src/mail/ngx_mail_core_module.c
@@ -285,7 +285,7 @@
u.url = value[1];
u.listen = 1;
- if (ngx_parse_url(cf, &u) != NGX_OK) {
+ if (ngx_parse_url(cf->pool, &u) != NGX_OK) {
if (u.err) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"%s in \"%V\" of the \"listen\" directive",
diff --git a/src/mysql/ngx_http_mysql_test.c b/src/mysql/ngx_http_mysql_test.c
index f809326..7892743 100644
--- a/src/mysql/ngx_http_mysql_test.c
+++ b/src/mysql/ngx_http_mysql_test.c
@@ -187,7 +187,7 @@
u.url = value[1];
u.default_port = 3306;
- if (ngx_parse_url(cf, &u) != NGX_OK) {
+ if (ngx_parse_url(cf->pool, &u) != NGX_OK) {
if (u.err) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"%s in upstream \"%V\"", u.err, &u.url);
