comparison src/core/ngx_connection.c @ 2049:2a92804f4109

*) 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 7018254cc006
children 74477ea8074f
comparison
equal deleted inserted replaced
2048:824615f3b4ec 2049:2a92804f4109
34 sin->sin_family = AF_INET; 34 sin->sin_family = AF_INET;
35 sin->sin_addr.s_addr = addr; 35 sin->sin_addr.s_addr = addr;
36 sin->sin_port = htons(port); 36 sin->sin_port = htons(port);
37 37
38 38
39 ls->addr_text.data = ngx_palloc(cf->pool, 39 ls->addr_text.data = ngx_pnalloc(cf->pool,
40 INET_ADDRSTRLEN - 1 + sizeof(":65535") - 1); 40 INET_ADDRSTRLEN - 1 + sizeof(":65535") - 1);
41 if (ls->addr_text.data == NULL) { 41 if (ls->addr_text.data == NULL) {
42 return NULL; 42 return NULL;
43 } 43 }
44 44
104 continue; 104 continue;
105 } 105 }
106 106
107 ls[i].addr_text_max_len = INET_ADDRSTRLEN; 107 ls[i].addr_text_max_len = INET_ADDRSTRLEN;
108 108
109 ls[i].addr_text.data = ngx_palloc(cycle->pool, INET_ADDRSTRLEN - 1 109 ls[i].addr_text.data = ngx_pnalloc(cycle->pool,
110 + sizeof(":65535") - 1); 110 INET_ADDRSTRLEN - 1 + sizeof(":65535") - 1);
111 if (ls[i].addr_text.data == NULL) { 111 if (ls[i].addr_text.data == NULL) {
112 return NGX_ERROR; 112 return NGX_ERROR;
113 } 113 }
114 114
115 ls[i].family = sin->sin_family; 115 ls[i].family = sin->sin_family;