aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRoman Arutyunyan <arut@nginx.com>2016-03-28 13:35:25 +0300
committerRoman Arutyunyan <arut@nginx.com>2016-03-28 13:35:25 +0300
commit3d791c46f5eddaa620be1f8a90b53b7c7aaa4cf3 (patch)
treea08b2ff0634d352c2f8a191bf7f6a842a2f26c9a /src
parentc3aed0a23392a509f64b740064f5f6633e8c89d8 (diff)
downloadnginx-3d791c46f5eddaa620be1f8a90b53b7c7aaa4cf3.tar.gz
nginx-3d791c46f5eddaa620be1f8a90b53b7c7aaa4cf3.zip
Sub filter: fixed allocation alignment.
Diffstat (limited to 'src')
-rw-r--r--src/http/modules/ngx_http_sub_filter_module.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/http/modules/ngx_http_sub_filter_module.c b/src/http/modules/ngx_http_sub_filter_module.c
index 8ba75edb7..7bf6e1982 100644
--- a/src/http/modules/ngx_http_sub_filter_module.c
+++ b/src/http/modules/ngx_http_sub_filter_module.c
@@ -229,7 +229,7 @@ ngx_http_sub_header_filter(ngx_http_request_t *r)
return ngx_http_next_header_filter(r);
}
- ctx->matches = ngx_pnalloc(r->pool, sizeof(ngx_array_t));
+ ctx->matches = ngx_palloc(r->pool, sizeof(ngx_array_t));
if (ctx->matches == NULL) {
return NGX_ERROR;
}
@@ -237,7 +237,7 @@ ngx_http_sub_header_filter(ngx_http_request_t *r)
ctx->matches->elts = matches;
ctx->matches->nelts = j;
- ctx->tables = ngx_pnalloc(r->pool, sizeof(ngx_http_sub_tables_t));
+ ctx->tables = ngx_palloc(r->pool, sizeof(ngx_http_sub_tables_t));
if (ctx->tables == NULL) {
return NGX_ERROR;
}
@@ -859,7 +859,7 @@ ngx_http_sub_merge_conf(ngx_conf_t *cf, void *parent, void *child)
pairs = conf->pairs->elts;
n = conf->pairs->nelts;
- matches = ngx_pnalloc(cf->pool, sizeof(ngx_http_sub_match_t) * n);
+ matches = ngx_palloc(cf->pool, sizeof(ngx_http_sub_match_t) * n);
if (matches == NULL) {
return NGX_CONF_ERROR;
}
@@ -869,7 +869,7 @@ ngx_http_sub_merge_conf(ngx_conf_t *cf, void *parent, void *child)
matches[i].value = &pairs[i].value;
}
- conf->matches = ngx_pnalloc(cf->pool, sizeof(ngx_array_t));
+ conf->matches = ngx_palloc(cf->pool, sizeof(ngx_array_t));
if (conf->matches == NULL) {
return NGX_CONF_ERROR;
}