aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/http/modules/ngx_http_flv_module.c4
-rw-r--r--src/http/modules/ngx_http_gzip_filter_module.c2
-rw-r--r--src/http/modules/ngx_http_gzip_static_module.c2
-rw-r--r--src/http/modules/ngx_http_image_filter_module.c6
-rw-r--r--src/http/modules/ngx_http_mp4_module.c2
-rw-r--r--src/http/modules/ngx_http_static_module.c2
-rw-r--r--src/http/modules/ngx_http_xslt_filter_module.c2
-rw-r--r--src/http/ngx_http_core_module.c2
-rw-r--r--src/http/ngx_http_file_cache.c2
9 files changed, 12 insertions, 12 deletions
diff --git a/src/http/modules/ngx_http_flv_module.c b/src/http/modules/ngx_http_flv_module.c
index cc2532027..7b72fae03 100644
--- a/src/http/modules/ngx_http_flv_module.c
+++ b/src/http/modules/ngx_http_flv_module.c
@@ -203,7 +203,7 @@ ngx_http_flv_handler(ngx_http_request_t *r)
}
if (i == 0) {
- b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t));
+ b = ngx_calloc_buf(r->pool);
if (b == NULL) {
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}
@@ -217,7 +217,7 @@ ngx_http_flv_handler(ngx_http_request_t *r)
}
- b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t));
+ b = ngx_calloc_buf(r->pool);
if (b == NULL) {
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}
diff --git a/src/http/modules/ngx_http_gzip_filter_module.c b/src/http/modules/ngx_http_gzip_filter_module.c
index f9652d054..287fd3674 100644
--- a/src/http/modules/ngx_http_gzip_filter_module.c
+++ b/src/http/modules/ngx_http_gzip_filter_module.c
@@ -644,7 +644,7 @@ ngx_http_gzip_filter_gzheader(ngx_http_request_t *r, ngx_http_gzip_ctx_t *ctx)
static u_char gzheader[10] =
{ 0x1f, 0x8b, Z_DEFLATED, 0, 0, 0, 0, 0, 0, 3 };
- b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t));
+ b = ngx_calloc_buf(r->pool);
if (b == NULL) {
return NGX_ERROR;
}
diff --git a/src/http/modules/ngx_http_gzip_static_module.c b/src/http/modules/ngx_http_gzip_static_module.c
index b9294dd94..1d87cd4ef 100644
--- a/src/http/modules/ngx_http_gzip_static_module.c
+++ b/src/http/modules/ngx_http_gzip_static_module.c
@@ -248,7 +248,7 @@ ngx_http_gzip_static_handler(ngx_http_request_t *r)
/* we need to allocate all before the header would be sent */
- b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t));
+ b = ngx_calloc_buf(r->pool);
if (b == NULL) {
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}
diff --git a/src/http/modules/ngx_http_image_filter_module.c b/src/http/modules/ngx_http_image_filter_module.c
index dbec5d8e5..6c03e8aec 100644
--- a/src/http/modules/ngx_http_image_filter_module.c
+++ b/src/http/modules/ngx_http_image_filter_module.c
@@ -581,7 +581,7 @@ ngx_http_image_json(ngx_http_request_t *r, ngx_http_image_filter_ctx_t *ctx)
size_t len;
ngx_buf_t *b;
- b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t));
+ b = ngx_calloc_buf(r->pool);
if (b == NULL) {
return NULL;
}
@@ -633,7 +633,7 @@ ngx_http_image_asis(ngx_http_request_t *r, ngx_http_image_filter_ctx_t *ctx)
{
ngx_buf_t *b;
- b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t));
+ b = ngx_calloc_buf(r->pool);
if (b == NULL) {
return NULL;
}
@@ -1067,7 +1067,7 @@ transparent:
return NULL;
}
- b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t));
+ b = ngx_calloc_buf(r->pool);
if (b == NULL) {
gdFree(out);
return NULL;
diff --git a/src/http/modules/ngx_http_mp4_module.c b/src/http/modules/ngx_http_mp4_module.c
index f3c0fddb9..08a68d07b 100644
--- a/src/http/modules/ngx_http_mp4_module.c
+++ b/src/http/modules/ngx_http_mp4_module.c
@@ -636,7 +636,7 @@ ngx_http_mp4_handler(ngx_http_request_t *r)
}
if (mp4 == NULL) {
- b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t));
+ b = ngx_calloc_buf(r->pool);
if (b == NULL) {
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}
diff --git a/src/http/modules/ngx_http_static_module.c b/src/http/modules/ngx_http_static_module.c
index f2435a78d..b0513be1c 100644
--- a/src/http/modules/ngx_http_static_module.c
+++ b/src/http/modules/ngx_http_static_module.c
@@ -233,7 +233,7 @@ ngx_http_static_handler(ngx_http_request_t *r)
/* we need to allocate all before the header would be sent */
- b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t));
+ b = ngx_calloc_buf(r->pool);
if (b == NULL) {
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}
diff --git a/src/http/modules/ngx_http_xslt_filter_module.c b/src/http/modules/ngx_http_xslt_filter_module.c
index 695f3bfda..fae589550 100644
--- a/src/http/modules/ngx_http_xslt_filter_module.c
+++ b/src/http/modules/ngx_http_xslt_filter_module.c
@@ -584,7 +584,7 @@ ngx_http_xslt_apply_stylesheet(ngx_http_request_t *r,
return NULL;
}
- b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t));
+ b = ngx_calloc_buf(r->pool);
if (b == NULL) {
ngx_free(buf);
return NULL;
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 292671d13..38df6ac1f 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -1926,7 +1926,7 @@ ngx_http_send_response(ngx_http_request_t *r, ngx_uint_t status,
return ngx_http_send_header(r);
}
- b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t));
+ b = ngx_calloc_buf(r->pool);
if (b == NULL) {
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}
diff --git a/src/http/ngx_http_file_cache.c b/src/http/ngx_http_file_cache.c
index 8c75f95f9..b635b354e 100644
--- a/src/http/ngx_http_file_cache.c
+++ b/src/http/ngx_http_file_cache.c
@@ -1577,7 +1577,7 @@ ngx_http_cache_send(ngx_http_request_t *r)
/* we need to allocate all before the header would be sent */
- b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t));
+ b = ngx_calloc_buf(r->pool);
if (b == NULL) {
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}