Mercurial > hg > nginx
changeset 6973:99934aade555
Use ngx_calloc_buf() where appropriate.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Wed, 12 Apr 2017 22:21:04 +0300 |
parents | 6e8c249b34ea |
children | 289403abc84e |
files | src/http/modules/ngx_http_flv_module.c src/http/modules/ngx_http_gzip_filter_module.c src/http/modules/ngx_http_gzip_static_module.c src/http/modules/ngx_http_image_filter_module.c src/http/modules/ngx_http_mp4_module.c src/http/modules/ngx_http_static_module.c src/http/modules/ngx_http_xslt_filter_module.c src/http/ngx_http_core_module.c src/http/ngx_http_file_cache.c |
diffstat | 9 files changed, 12 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_flv_module.c Wed Apr 12 22:14:24 2017 +0300 +++ b/src/http/modules/ngx_http_flv_module.c Wed Apr 12 22:21:04 2017 +0300 @@ -203,7 +203,7 @@ } 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 @@ } - b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t)); + b = ngx_calloc_buf(r->pool); if (b == NULL) { return NGX_HTTP_INTERNAL_SERVER_ERROR; }
--- a/src/http/modules/ngx_http_gzip_filter_module.c Wed Apr 12 22:14:24 2017 +0300 +++ b/src/http/modules/ngx_http_gzip_filter_module.c Wed Apr 12 22:21:04 2017 +0300 @@ -644,7 +644,7 @@ 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; }
--- a/src/http/modules/ngx_http_gzip_static_module.c Wed Apr 12 22:14:24 2017 +0300 +++ b/src/http/modules/ngx_http_gzip_static_module.c Wed Apr 12 22:21:04 2017 +0300 @@ -248,7 +248,7 @@ /* 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; }
--- a/src/http/modules/ngx_http_image_filter_module.c Wed Apr 12 22:14:24 2017 +0300 +++ b/src/http/modules/ngx_http_image_filter_module.c Wed Apr 12 22:21:04 2017 +0300 @@ -581,7 +581,7 @@ 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_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 @@ return NULL; } - b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t)); + b = ngx_calloc_buf(r->pool); if (b == NULL) { gdFree(out); return NULL;
--- a/src/http/modules/ngx_http_mp4_module.c Wed Apr 12 22:14:24 2017 +0300 +++ b/src/http/modules/ngx_http_mp4_module.c Wed Apr 12 22:21:04 2017 +0300 @@ -636,7 +636,7 @@ } 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; }
--- a/src/http/modules/ngx_http_static_module.c Wed Apr 12 22:14:24 2017 +0300 +++ b/src/http/modules/ngx_http_static_module.c Wed Apr 12 22:21:04 2017 +0300 @@ -233,7 +233,7 @@ /* 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; }
--- a/src/http/modules/ngx_http_xslt_filter_module.c Wed Apr 12 22:14:24 2017 +0300 +++ b/src/http/modules/ngx_http_xslt_filter_module.c Wed Apr 12 22:21:04 2017 +0300 @@ -584,7 +584,7 @@ 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;
--- a/src/http/ngx_http_core_module.c Wed Apr 12 22:14:24 2017 +0300 +++ b/src/http/ngx_http_core_module.c Wed Apr 12 22:21:04 2017 +0300 @@ -1926,7 +1926,7 @@ 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; }
--- a/src/http/ngx_http_file_cache.c Wed Apr 12 22:14:24 2017 +0300 +++ b/src/http/ngx_http_file_cache.c Wed Apr 12 22:21:04 2017 +0300 @@ -1577,7 +1577,7 @@ /* 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; }