Mercurial > hg > nginx

comparison src/http/ngx_http_upstream.c @ 2049:2a92804f4109

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*) back out r2040 *) refactor ngx_palloc() *) introduce ngx_pnalloc() *) additional pool blocks have smaller header
author Igor Sysoev <igor@sysoev.ru>
date Tue, 17 Jun 2008 15:00:30 +0000
parents 54e4d1b6c183
children dce5ddef5af9
comparison
equal deleted inserted replaced
2048:824615f3b4ec 2049:2a92804f4109
2815 } else { 2815 } else {
2816 len += 3; 2816 len += 3;
2817 } 2817 }
2818 } 2818 }
2819 2819
2820 p = ngx_palloc(r->pool, len); 2820 p = ngx_pnalloc(r->pool, len);
2821 if (p == NULL) { 2821 if (p == NULL) {
2822 return NGX_ERROR; 2822 return NGX_ERROR;
2823 } 2823 }
2824 2824
2825 v->data = p; 2825 v->data = p;
2876 return NGX_OK; 2876 return NGX_OK;
2877 } 2877 }
2878 2878
2879 len = r->upstream_states->nelts * (3 + 2); 2879 len = r->upstream_states->nelts * (3 + 2);
2880 2880
2881 p = ngx_palloc(r->pool, len); 2881 p = ngx_pnalloc(r->pool, len);
2882 if (p == NULL) { 2882 if (p == NULL) {
2883 return NGX_ERROR; 2883 return NGX_ERROR;
2884 } 2884 }
2885 2885
2886 v->data = p; 2886 v->data = p;
2942 return NGX_OK; 2942 return NGX_OK;
2943 } 2943 }
2944 2944
2945 len = r->upstream_states->nelts * (NGX_TIME_T_LEN + 4 + 2); 2945 len = r->upstream_states->nelts * (NGX_TIME_T_LEN + 4 + 2);
2946 2946
2947 p = ngx_palloc(r->pool, len); 2947 p = ngx_pnalloc(r->pool, len);
2948 if (p == NULL) { 2948 if (p == NULL) {
2949 return NGX_ERROR; 2949 return NGX_ERROR;
2950 } 2950 }
2951 2951
2952 v->data = p; 2952 v->data = p;