*) back out r2040
*) refactor ngx_palloc()
*) introduce ngx_pnalloc()
*) additional pool blocks have smaller header
diff --git a/src/http/modules/ngx_http_auth_basic_module.c b/src/http/modules/ngx_http_auth_basic_module.c
index 41e53cd..b09359d 100644
--- a/src/http/modules/ngx_http_auth_basic_module.c
+++ b/src/http/modules/ngx_http_auth_basic_module.c
@@ -232,7 +232,7 @@
if (state == sw_passwd) {
pwd.len = i - passwd;
- pwd.data = ngx_palloc(r->pool, pwd.len + 1);
+ pwd.data = ngx_pnalloc(r->pool, pwd.len + 1);
if (pwd.data == NULL) {
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}
@@ -400,7 +400,7 @@
len = sizeof("Basic realm=\"") - 1 + realm->len + 1;
- basic = ngx_palloc(cf->pool, len);
+ basic = ngx_pnalloc(cf->pool, len);
if (basic == NULL) {
return NGX_CONF_ERROR;
}
diff --git a/src/http/modules/ngx_http_autoindex_module.c b/src/http/modules/ngx_http_autoindex_module.c
index f57fbc8..b5b6ef7 100644
--- a/src/http/modules/ngx_http_autoindex_module.c
+++ b/src/http/modules/ngx_http_autoindex_module.c
@@ -282,7 +282,7 @@
allocated = path.len + 1 + len + 1
+ NGX_HTTP_AUTOINDEX_PREALLOCATE;
- filename = ngx_palloc(pool, allocated);
+ filename = ngx_pnalloc(pool, allocated);
if (filename == NULL) {
return ngx_http_autoindex_error(r, &dir, &path);
}
@@ -318,7 +318,7 @@
entry->name.len = len;
- entry->name.data = ngx_palloc(pool, len + 1);
+ entry->name.data = ngx_pnalloc(pool, len + 1);
if (entry->name.data == NULL) {
return ngx_http_autoindex_error(r, &dir, &path);
}
diff --git a/src/http/modules/ngx_http_dav_module.c b/src/http/modules/ngx_http_dav_module.c
index 3d54525..33bb2e9 100644
--- a/src/http/modules/ngx_http_dav_module.c
+++ b/src/http/modules/ngx_http_dav_module.c
@@ -1102,7 +1102,7 @@
location = path + clcf->root.len;
} else {
- location = ngx_palloc(r->pool, r->uri.len);
+ location = ngx_pnalloc(r->pool, r->uri.len);
if (location == NULL) {
return NGX_ERROR;
}
diff --git a/src/http/modules/ngx_http_fastcgi_module.c b/src/http/modules/ngx_http_fastcgi_module.c
index 5569745..b975c06 100644
--- a/src/http/modules/ngx_http_fastcgi_module.c
+++ b/src/http/modules/ngx_http_fastcgi_module.c
@@ -1059,7 +1059,7 @@
size += part[i].end - part[i].start;
}
- p = ngx_palloc(r->pool, size);
+ p = ngx_pnalloc(r->pool, size);
if (p == NULL) {
return NGX_ERROR;
}
@@ -1087,7 +1087,7 @@
h->value.data = r->header_start;
h->value.data[h->value.len] = '\0';
- h->lowcase_key = ngx_palloc(r->pool, h->key.len);
+ h->lowcase_key = ngx_pnalloc(r->pool, h->key.len);
if (h->lowcase_key == NULL) {
return NGX_ERROR;
}
@@ -1097,9 +1097,9 @@
h->key.len = r->header_name_end - r->header_name_start;
h->value.len = r->header_end - r->header_start;
- h->key.data = ngx_palloc(r->pool,
- h->key.len + 1 + h->value.len + 1
- + h->key.len);
+ h->key.data = ngx_pnalloc(r->pool,
+ h->key.len + 1 + h->value.len + 1
+ + h->key.len);
if (h->key.data == NULL) {
return NGX_ERROR;
}
@@ -2015,7 +2015,7 @@
v->len = r->uri.len + flcf->index.len;
- v->data = ngx_palloc(r->pool, v->len);
+ v->data = ngx_pnalloc(r->pool, v->len);
if (v->data == NULL) {
return NGX_ERROR;
}
diff --git a/src/http/modules/ngx_http_gzip_filter_module.c b/src/http/modules/ngx_http_gzip_filter_module.c
index 1587c00..3677318 100644
--- a/src/http/modules/ngx_http_gzip_filter_module.c
+++ b/src/http/modules/ngx_http_gzip_filter_module.c
@@ -802,7 +802,7 @@
return NGX_OK;
}
- v->data = ngx_palloc(r->pool, NGX_INT32_LEN + 3);
+ v->data = ngx_pnalloc(r->pool, NGX_INT32_LEN + 3);
if (v->data == NULL) {
return NGX_ERROR;
}
@@ -951,7 +951,7 @@
type->len = value[i].len;
- type->data = ngx_palloc(cf->pool, type->len + 1);
+ type->data = ngx_pnalloc(cf->pool, type->len + 1);
if (type->data == NULL) {
return NGX_CONF_ERROR;
}
diff --git a/src/http/modules/ngx_http_headers_filter_module.c b/src/http/modules/ngx_http_headers_filter_module.c
index ad9467b..95d846f 100644
--- a/src/http/modules/ngx_http_headers_filter_module.c
+++ b/src/http/modules/ngx_http_headers_filter_module.c
@@ -264,7 +264,7 @@
return NGX_OK;
}
- expires->value.data = ngx_palloc(r->pool, len);
+ expires->value.data = ngx_pnalloc(r->pool, len);
if (expires->value.data == NULL) {
return NGX_ERROR;
}
@@ -297,8 +297,8 @@
return NGX_OK;
}
- cc->value.data = ngx_palloc(r->pool,
- sizeof("max-age=") + NGX_TIME_T_LEN + 1);
+ cc->value.data = ngx_pnalloc(r->pool,
+ sizeof("max-age=") + NGX_TIME_T_LEN + 1);
if (cc->value.data == NULL) {
return NGX_ERROR;
}
diff --git a/src/http/modules/ngx_http_index_module.c b/src/http/modules/ngx_http_index_module.c
index 6bfb045..bd9c18c 100644
--- a/src/http/modules/ngx_http_index_module.c
+++ b/src/http/modules/ngx_http_index_module.c
@@ -254,7 +254,7 @@
uri.data = path.data + root;
} else {
- uri.data = ngx_palloc(r->pool, uri.len);
+ uri.data = ngx_pnalloc(r->pool, uri.len);
if (uri.data == NULL) {
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}
diff --git a/src/http/modules/ngx_http_log_module.c b/src/http/modules/ngx_http_log_module.c
index 3d8730a..47358ed 100644
--- a/src/http/modules/ngx_http_log_module.c
+++ b/src/http/modules/ngx_http_log_module.c
@@ -261,7 +261,7 @@
}
}
- line = ngx_palloc(r->pool, len);
+ line = ngx_pnalloc(r->pool, len);
if (line == NULL) {
return NGX_ERROR;
}
@@ -970,7 +970,7 @@
} else {
op->run = ngx_http_log_copy_long;
- p = ngx_palloc(cf->pool, len);
+ p = ngx_pnalloc(cf->pool, len);
if (p == NULL) {
return NGX_CONF_ERROR;
}
diff --git a/src/http/modules/ngx_http_map_module.c b/src/http/modules/ngx_http_map_module.c
index c1d87c1..cedc508 100644
--- a/src/http/modules/ngx_http_map_module.c
+++ b/src/http/modules/ngx_http_map_module.c
@@ -130,7 +130,7 @@
return NGX_OK;
}
- name = ngx_palloc(r->pool, len);
+ name = ngx_pnalloc(r->pool, len);
if (name == NULL) {
return NGX_ERROR;
}
diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c
index 619390b..278edb6 100644
--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -964,8 +964,8 @@
u->state->status = ctx->status;
u->headers_in.status_line.len = ctx->status_end - ctx->status_start;
- u->headers_in.status_line.data = ngx_palloc(r->pool,
- u->headers_in.status_line.len);
+ u->headers_in.status_line.data = ngx_pnalloc(r->pool,
+ u->headers_in.status_line.len);
if (u->headers_in.status_line.data == NULL) {
return NGX_ERROR;
}
@@ -1220,7 +1220,7 @@
h->key.len = r->header_name_end - r->header_name_start;
h->value.len = r->header_end - r->header_start;
- h->key.data = ngx_palloc(r->pool,
+ h->key.data = ngx_pnalloc(r->pool,
h->key.len + 1 + h->value.len + 1 + h->key.len);
if (h->key.data == NULL) {
return NGX_ERROR;
@@ -1400,7 +1400,7 @@
v->len = r->headers_in.x_forwarded_for->value.len
+ sizeof(", ") - 1 + r->connection->addr_text.len;
- p = ngx_palloc(r->pool, v->len);
+ p = ngx_pnalloc(r->pool, v->len);
if (p == NULL) {
return NGX_ERROR;
}
@@ -1435,7 +1435,7 @@
v->no_cacheable = 0;
v->not_found = 0;
- v->data = ngx_palloc(r->connection->pool, NGX_SIZE_T_LEN);
+ v->data = ngx_pnalloc(r->connection->pool, NGX_SIZE_T_LEN);
if (v->data == NULL) {
return NGX_ERROR;
@@ -1492,7 +1492,7 @@
len = prefix + pr->replacement.text.len + h->value.len - pr->redirect.len;
- data = ngx_palloc(r->pool, len);
+ data = ngx_pnalloc(r->pool, len);
if (data == NULL) {
return NGX_ERROR;
}
@@ -1544,7 +1544,7 @@
len += lcode(&e);
}
- data = ngx_palloc(r->pool, len);
+ data = ngx_pnalloc(r->pool, len);
if (data == NULL) {
return NGX_ERROR;
}
diff --git a/src/http/modules/ngx_http_range_filter_module.c b/src/http/modules/ngx_http_range_filter_module.c
index cf42daf..e2137f2 100644
--- a/src/http/modules/ngx_http_range_filter_module.c
+++ b/src/http/modules/ngx_http_range_filter_module.c
@@ -307,7 +307,7 @@
content_range->key.len = sizeof("Content-Range") - 1;
content_range->key.data = (u_char *) "Content-Range";
- content_range->value.data = ngx_palloc(r->pool,
+ content_range->value.data = ngx_pnalloc(r->pool,
sizeof("bytes */") - 1 + NGX_OFF_T_LEN);
if (content_range->value.data == NULL) {
return NGX_ERROR;
@@ -341,7 +341,7 @@
content_range->key.data = (u_char *) "Content-Range";
content_range->value.data =
- ngx_palloc(r->pool, sizeof("bytes -/") - 1 + 3 * NGX_OFF_T_LEN);
+ ngx_pnalloc(r->pool, sizeof("bytes -/") - 1 + 3 * NGX_OFF_T_LEN);
if (content_range->value.data == NULL) {
return NGX_ERROR;
}
@@ -376,7 +376,7 @@
len += sizeof("; charset=") - 1 + r->headers_out.charset.len;
}
- ctx->boundary_header.data = ngx_palloc(r->pool, len);
+ ctx->boundary_header.data = ngx_pnalloc(r->pool, len);
if (ctx->boundary_header.data == NULL) {
return NGX_ERROR;
}
@@ -414,9 +414,9 @@
}
r->headers_out.content_type.data =
- ngx_palloc(r->pool,
- sizeof("Content-Type: multipart/byteranges; boundary=") - 1
- + NGX_ATOMIC_T_LEN);
+ ngx_pnalloc(r->pool,
+ sizeof("Content-Type: multipart/byteranges; boundary=") - 1
+ + NGX_ATOMIC_T_LEN);
if (r->headers_out.content_type.data == NULL) {
return NGX_ERROR;
@@ -441,7 +441,7 @@
/* the size of the range: "SSSS-EEEE/TTTT" CRLF CRLF */
range[i].content_range.data =
- ngx_palloc(r->pool, 3 * NGX_OFF_T_LEN + 2 + 4);
+ ngx_pnalloc(r->pool, 3 * NGX_OFF_T_LEN + 2 + 4);
if (range[i].content_range.data == NULL) {
return NGX_ERROR;
@@ -649,8 +649,8 @@
b->temporary = 1;
b->last_buf = 1;
- b->pos = ngx_palloc(r->pool, sizeof(CRLF "--") - 1 + NGX_ATOMIC_T_LEN
- + sizeof("--" CRLF) - 1);
+ b->pos = ngx_pnalloc(r->pool, sizeof(CRLF "--") - 1 + NGX_ATOMIC_T_LEN
+ + sizeof("--" CRLF) - 1);
if (b->pos == NULL) {
return NGX_ERROR;
}
diff --git a/src/http/modules/ngx_http_realip_module.c b/src/http/modules/ngx_http_realip_module.c
index 4de4c13..bff83c2 100644
--- a/src/http/modules/ngx_http_realip_module.c
+++ b/src/http/modules/ngx_http_realip_module.c
@@ -163,7 +163,7 @@
return NGX_DECLINED;
}
- p = ngx_palloc(r->connection->pool, len);
+ p = ngx_pnalloc(r->connection->pool, len);
if (p == NULL) {
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}
diff --git a/src/http/modules/ngx_http_ssi_filter_module.c b/src/http/modules/ngx_http_ssi_filter_module.c
index e182619..a855868 100644
--- a/src/http/modules/ngx_http_ssi_filter_module.c
+++ b/src/http/modules/ngx_http_ssi_filter_module.c
@@ -1151,8 +1151,8 @@
default:
ctx->command.len = 1;
- ctx->command.data = ngx_palloc(r->pool,
- NGX_HTTP_SSI_COMMAND_LEN);
+ ctx->command.data = ngx_pnalloc(r->pool,
+ NGX_HTTP_SSI_COMMAND_LEN);
if (ctx->command.data == NULL) {
return NGX_ERROR;
}
@@ -1218,8 +1218,8 @@
}
ctx->param->key.len = 1;
- ctx->param->key.data = ngx_palloc(r->pool,
- NGX_HTTP_SSI_PARAM_LEN);
+ ctx->param->key.data = ngx_pnalloc(r->pool,
+ NGX_HTTP_SSI_PARAM_LEN);
if (ctx->param->key.data == NULL) {
return NGX_ERROR;
}
@@ -1229,8 +1229,8 @@
ctx->param->value.len = 0;
if (ctx->value_buf == NULL) {
- ctx->param->value.data = ngx_palloc(r->pool,
- ctx->value_len);
+ ctx->param->value.data = ngx_pnalloc(r->pool,
+ ctx->value_len);
if (ctx->param->value.data == NULL) {
return NGX_ERROR;
}
@@ -1408,7 +1408,7 @@
case ssi_postparam_state:
if (ctx->param->value.len + 1 < ctx->value_len / 2) {
- value = ngx_palloc(r->pool, ctx->param->value.len + 1);
+ value = ngx_pnalloc(r->pool, ctx->param->value.len + 1);
if (value == NULL) {
return NGX_ERROR;
}
@@ -1626,7 +1626,7 @@
if (prefix) {
len = prefix + text->len;
- data = ngx_palloc(r->pool, len);
+ data = ngx_pnalloc(r->pool, len);
if (data == NULL) {
return NGX_ERROR;
}
@@ -1829,7 +1829,7 @@
}
}
- p = ngx_palloc(r->pool, len + ((flags & NGX_HTTP_SSI_ADD_ZERO) ? 1 : 0));
+ p = ngx_pnalloc(r->pool, len + ((flags & NGX_HTTP_SSI_ADD_ZERO) ? 1 : 0));
if (p == NULL) {
return NGX_ERROR;
}
@@ -2222,7 +2222,7 @@
NGX_ESCAPE_HTML);
if (len) {
- p = ngx_palloc(r->pool, value->len + len);
+ p = ngx_pnalloc(r->pool, value->len + len);
if (p == NULL) {
return NGX_HTTP_SSI_ERROR;
}
@@ -2239,7 +2239,7 @@
len = ngx_escape_html(NULL, value->data, value->len);
if (len) {
- p = ngx_palloc(r->pool, value->len + len);
+ p = ngx_pnalloc(r->pool, value->len + len);
if (p == NULL) {
return NGX_HTTP_SSI_ERROR;
}
@@ -2286,7 +2286,7 @@
if (value) {
ctx->timefmt.len = value->len;
- ctx->timefmt.data = ngx_palloc(r->pool, value->len + 1);
+ ctx->timefmt.data = ngx_pnalloc(r->pool, value->len + 1);
if (ctx->timefmt.data == NULL) {
return NGX_HTTP_SSI_ERROR;
}
@@ -2666,7 +2666,7 @@
|| (ctx->timefmt.len == sizeof("%s") - 1
&& ctx->timefmt.data[0] == '%' && ctx->timefmt.data[1] == 's'))
{
- v->data = ngx_palloc(r->pool, NGX_TIME_T_LEN);
+ v->data = ngx_pnalloc(r->pool, NGX_TIME_T_LEN);
if (v->data == NULL) {
return NGX_ERROR;
}
@@ -2689,7 +2689,7 @@
return NGX_ERROR;
}
- v->data = ngx_palloc(r->pool, v->len);
+ v->data = ngx_pnalloc(r->pool, v->len);
if (v->data == NULL) {
return NGX_ERROR;
}
@@ -2738,7 +2738,7 @@
type->len = value[i].len;
- type->data = ngx_palloc(cf->pool, type->len + 1);
+ type->data = ngx_pnalloc(cf->pool, type->len + 1);
if (type->data == NULL) {
return NGX_CONF_ERROR;
}
diff --git a/src/http/modules/ngx_http_static_module.c b/src/http/modules/ngx_http_static_module.c
index 03d75cd..fc84268 100644
--- a/src/http/modules/ngx_http_static_module.c
+++ b/src/http/modules/ngx_http_static_module.c
@@ -162,7 +162,7 @@
len += r->args.len + 1;
}
- location = ngx_palloc(r->pool, len);
+ location = ngx_pnalloc(r->pool, len);
if (location == NULL) {
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}
diff --git a/src/http/modules/ngx_http_sub_filter_module.c b/src/http/modules/ngx_http_sub_filter_module.c
index 663a9f5..6a9bb1c 100644
--- a/src/http/modules/ngx_http_sub_filter_module.c
+++ b/src/http/modules/ngx_http_sub_filter_module.c
@@ -710,7 +710,7 @@
type->len = value[i].len;
- type->data = ngx_palloc(cf->pool, type->len + 1);
+ type->data = ngx_pnalloc(cf->pool, type->len + 1);
if (type->data == NULL) {
return NGX_CONF_ERROR;
}
diff --git a/src/http/modules/ngx_http_userid_filter_module.c b/src/http/modules/ngx_http_userid_filter_module.c
index dee71ff..5082c74 100644
--- a/src/http/modules/ngx_http_userid_filter_module.c
+++ b/src/http/modules/ngx_http_userid_filter_module.c
@@ -420,7 +420,7 @@
len += conf->domain.len;
}
- cookie = ngx_palloc(r->pool, len);
+ cookie = ngx_pnalloc(r->pool, len);
if (cookie == NULL) {
return NGX_ERROR;
}
@@ -496,7 +496,7 @@
ngx_str_t *name, uint32_t *uid)
{
v->len = name->len + sizeof("=00001111222233334444555566667777") - 1;
- v->data = ngx_palloc(r->pool, v->len);
+ v->data = ngx_pnalloc(r->pool, v->len);
if (v->data == NULL) {
return NGX_ERROR;
}
@@ -620,7 +620,7 @@
return NGX_CONF_OK;
}
- new = ngx_palloc(cf->pool, sizeof("; domain=") - 1 + domain->len);
+ new = ngx_pnalloc(cf->pool, sizeof("; domain=") - 1 + domain->len);
if (new == NULL) {
return NGX_CONF_ERROR;
}
@@ -642,7 +642,7 @@
u_char *p, *new;
- new = ngx_palloc(cf->pool, sizeof("; path=") - 1 + path->len);
+ new = ngx_pnalloc(cf->pool, sizeof("; path=") - 1 + path->len);
if (new == NULL) {
return NGX_CONF_ERROR;
}
diff --git a/src/http/modules/perl/nginx.xs b/src/http/modules/perl/nginx.xs
index 4524a8c..94d6a2f 100644
--- a/src/http/modules/perl/nginx.xs
+++ b/src/http/modules/perl/nginx.xs
@@ -48,7 +48,7 @@
return NGX_OK;
}
- s->data = ngx_palloc(r->pool, len);
+ s->data = ngx_pnalloc(r->pool, len);
if (s->data == NULL) {
return NGX_ERROR;
}
@@ -242,7 +242,7 @@
/* look up hashed headers */
- lowcase_key = ngx_palloc(r->pool, len);
+ lowcase_key = ngx_pnalloc(r->pool, len);
if (lowcase_key == NULL) {
XSRETURN_UNDEF;
}
@@ -293,7 +293,7 @@
size += ph[i]->value.len + sizeof("; ") - 1;
}
- cookie = ngx_palloc(r->pool, size);
+ cookie = ngx_pnalloc(r->pool, size);
if (cookie == NULL) {
XSRETURN_UNDEF;
}
@@ -769,7 +769,7 @@
src = (u_char *) SvPV(text, len);
- p = ngx_palloc(r->pool, len + 1);
+ p = ngx_pnalloc(r->pool, len + 1);
if (p == NULL) {
XSRETURN_UNDEF;
}
@@ -826,7 +826,7 @@
p = (u_char *) SvPV(name, len);
- lowcase = ngx_palloc(r->pool, len);
+ lowcase = ngx_pnalloc(r->pool, len);
if (lowcase == NULL) {
XSRETURN_UNDEF;
}
diff --git a/src/http/modules/perl/ngx_http_perl_module.c b/src/http/modules/perl/ngx_http_perl_module.c
index ab89cad..2627942 100644
--- a/src/http/modules/perl/ngx_http_perl_module.c
+++ b/src/http/modules/perl/ngx_http_perl_module.c
@@ -703,7 +703,7 @@
line = SvPVx(POPs, n_a);
rv->len = n_a;
- rv->data = ngx_palloc(r->pool, n_a);
+ rv->data = ngx_pnalloc(r->pool, n_a);
if (rv->data == NULL) {
return NGX_ERROR;
}
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c
index 91bc3e6..ed4dacd 100644
--- a/src/http/ngx_http.c
+++ b/src/http/ngx_http.c
@@ -1024,8 +1024,8 @@
lq = (ngx_http_location_queue_t *) q;
len = lq->name->len - prefix;
- node = ngx_palloc_aligned(cf->pool,
- offsetof(ngx_http_location_tree_node_t, name) + len);
+ node = ngx_palloc(cf->pool,
+ offsetof(ngx_http_location_tree_node_t, name) + len);
if (node == NULL) {
return NULL;
}
@@ -1615,7 +1615,7 @@
hip->port = in_port->port;
- hip->port_text.data = ngx_palloc(cf->pool, 7);
+ hip->port_text.data = ngx_pnalloc(cf->pool, 7);
if (hip->port_text.data == NULL) {
return NGX_ERROR;
}
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index c359363..aa557c4 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -832,7 +832,7 @@
} else {
len = clcf->name.len + 1 + r->args.len;
- p = ngx_palloc(r->pool, len);
+ p = ngx_pnalloc(r->pool, len);
if (p == NULL) {
ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
@@ -1267,7 +1267,7 @@
if (c >= 'A' && c <= 'Z') {
- p = ngx_palloc(r->pool, r->exten.len);
+ p = ngx_pnalloc(r->pool, r->exten.len);
if (p == NULL) {
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}
@@ -1390,7 +1390,7 @@
path->len = clcf->root.len + reserved;
- path->data = ngx_palloc(r->pool, path->len);
+ path->data = ngx_pnalloc(r->pool, path->len);
if (path->data == NULL) {
return NULL;
}
@@ -1460,7 +1460,7 @@
}
auth.len = ngx_base64_decoded_length(encoded.len);
- auth.data = ngx_palloc(r->pool, auth.len + 1);
+ auth.data = ngx_pnalloc(r->pool, auth.len + 1);
if (auth.data == NULL) {
return NGX_ERROR;
}
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index 9ea987f..a42d1e2 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -654,7 +654,7 @@
if (r->complex_uri || r->quoted_uri) {
- r->uri.data = ngx_palloc(r->pool, r->uri.len + 1);
+ r->uri.data = ngx_pnalloc(r->pool, r->uri.len + 1);
if (r->uri.data == NULL) {
ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
return;
@@ -914,7 +914,7 @@
h->value.data = r->header_start;
h->value.data[h->value.len] = '\0';
- h->lowcase_key = ngx_palloc(r->pool, h->key.len);
+ h->lowcase_key = ngx_pnalloc(r->pool, h->key.len);
if (h->lowcase_key == NULL) {
ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
return;
@@ -1562,7 +1562,7 @@
server = buf;
} else {
- server = ngx_palloc(r->pool, len);
+ server = ngx_pnalloc(r->pool, len);
if (server == NULL) {
return NGX_ERROR;
}
diff --git a/src/http/ngx_http_script.c b/src/http/ngx_http_script.c
index acd867f..0bdb944 100644
--- a/src/http/ngx_http_script.c
+++ b/src/http/ngx_http_script.c
@@ -341,7 +341,7 @@
value->len = len;
- value->data = ngx_palloc(r->pool, len);
+ value->data = ngx_pnalloc(r->pool, len);
if (value->data == NULL) {
return NULL;
}
@@ -733,7 +733,7 @@
e->buf.len += r->args.len + 1;
}
- e->buf.data = ngx_palloc(r->pool, e->buf.len);
+ e->buf.data = ngx_pnalloc(r->pool, e->buf.len);
if (e->buf.data == NULL) {
e->ip = ngx_http_script_exit;
e->status = NGX_HTTP_INTERNAL_SERVER_ERROR;
@@ -1120,7 +1120,7 @@
}
e->buf.len = len;
- e->buf.data = ngx_palloc(e->request->pool, len);
+ e->buf.data = ngx_pnalloc(e->request->pool, len);
if (e->buf.data == NULL) {
e->ip = ngx_http_script_exit;
e->status = NGX_HTTP_INTERNAL_SERVER_ERROR;
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 9ec861c..27f27ae 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -2817,7 +2817,7 @@
}
}
- p = ngx_palloc(r->pool, len);
+ p = ngx_pnalloc(r->pool, len);
if (p == NULL) {
return NGX_ERROR;
}
@@ -2878,7 +2878,7 @@
len = r->upstream_states->nelts * (3 + 2);
- p = ngx_palloc(r->pool, len);
+ p = ngx_pnalloc(r->pool, len);
if (p == NULL) {
return NGX_ERROR;
}
@@ -2944,7 +2944,7 @@
len = r->upstream_states->nelts * (NGX_TIME_T_LEN + 4 + 2);
- p = ngx_palloc(r->pool, len);
+ p = ngx_pnalloc(r->pool, len);
if (p == NULL) {
return NGX_ERROR;
}
diff --git a/src/http/ngx_http_upstream_round_robin.c b/src/http/ngx_http_upstream_round_robin.c
index 0621371..e36e685 100644
--- a/src/http/ngx_http_upstream_round_robin.c
+++ b/src/http/ngx_http_upstream_round_robin.c
@@ -283,7 +283,7 @@
len = INET_ADDRSTRLEN - 1 + 1 + sizeof(":65536") - 1;
- p = ngx_palloc(r->pool, len);
+ p = ngx_pnalloc(r->pool, len);
if (p == NULL) {
return NGX_ERROR;
}
diff --git a/src/http/ngx_http_variables.c b/src/http/ngx_http_variables.c
index 16f0923..e014170 100644
--- a/src/http/ngx_http_variables.c
+++ b/src/http/ngx_http_variables.c
@@ -272,7 +272,7 @@
}
v->name.len = name->len;
- v->name.data = ngx_palloc(cf->pool, name->len);
+ v->name.data = ngx_pnalloc(cf->pool, name->len);
if (v->name.data == NULL) {
return NULL;
}
@@ -339,7 +339,7 @@
}
v->name.len = name->len;
- v->name.data = ngx_palloc(cf->pool, name->len);
+ v->name.data = ngx_pnalloc(cf->pool, name->len);
if (v->name.data == NULL) {
return NGX_ERROR;
}
@@ -615,7 +615,7 @@
len += h[i]->value.len + sizeof("; ") - 1;
}
- p = ngx_palloc(r->pool, len);
+ p = ngx_pnalloc(r->pool, len);
if (p == NULL) {
return NGX_ERROR;
}
@@ -782,7 +782,7 @@
v->no_cacheable = 0;
v->not_found = 0;
- v->data = ngx_palloc(r->pool, sizeof("65535") - 1);
+ v->data = ngx_pnalloc(r->pool, sizeof("65535") - 1);
if (v->data == NULL) {
return NGX_ERROR;
}
@@ -809,7 +809,7 @@
{
ngx_str_t s;
- s.data = ngx_palloc(r->pool, INET_ADDRSTRLEN);
+ s.data = ngx_pnalloc(r->pool, INET_ADDRSTRLEN);
if (s.data == NULL) {
return NGX_ERROR;
}
@@ -1032,7 +1032,7 @@
sent = 0;
}
- p = ngx_palloc(r->pool, NGX_OFF_T_LEN);
+ p = ngx_pnalloc(r->pool, NGX_OFF_T_LEN);
if (p == NULL) {
return NGX_ERROR;
}
@@ -1083,7 +1083,7 @@
}
if (r->headers_out.content_length_n >= 0) {
- p = ngx_palloc(r->pool, NGX_OFF_T_LEN);
+ p = ngx_pnalloc(r->pool, NGX_OFF_T_LEN);
if (p == NULL) {
return NGX_ERROR;
}
@@ -1120,7 +1120,7 @@
}
if (r->headers_out.last_modified_time >= 0) {
- p = ngx_palloc(r->pool,
+ p = ngx_pnalloc(r->pool,
sizeof("Last-Modified: Mon, 28 Sep 1970 06:00:00 GMT") - 1);
if (p == NULL) {
return NGX_ERROR;
@@ -1179,7 +1179,7 @@
if (clcf->keepalive_header) {
- p = ngx_palloc(r->pool, sizeof("timeout=") - 1 + NGX_TIME_T_LEN);
+ p = ngx_pnalloc(r->pool, sizeof("timeout=") - 1 + NGX_TIME_T_LEN);
if (p == NULL) {
return NGX_ERROR;
}
