Mercurial > hg > nginx

comparison src/mail/ngx_mail_imap_module.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 f69493e8faab
children 8156bc03982a
comparison
equal deleted inserted replaced
2048:824615f3b4ec 2049:2a92804f4109
181 if (m & conf->auth_methods) { 181 if (m & conf->auth_methods) {
182 size += 1 + ngx_mail_imap_auth_methods_names[i].len; 182 size += 1 + ngx_mail_imap_auth_methods_names[i].len;
183 } 183 }
184 } 184 }
185 185
186 p = ngx_palloc(cf->pool, size); 186 p = ngx_pnalloc(cf->pool, size);
187 if (p == NULL) { 187 if (p == NULL) {
188 return NGX_CONF_ERROR; 188 return NGX_CONF_ERROR;
189 } 189 }
190 190
191 conf->capability.len = size; 191 conf->capability.len = size;
214 *p++ = CR; *p = LF; 214 *p++ = CR; *p = LF;
215 215
216 216
217 size += sizeof(" STARTTLS") - 1; 217 size += sizeof(" STARTTLS") - 1;
218 218
219 p = ngx_palloc(cf->pool, size); 219 p = ngx_pnalloc(cf->pool, size);
220 if (p == NULL) { 220 if (p == NULL) {
221 return NGX_CONF_ERROR; 221 return NGX_CONF_ERROR;
222 } 222 }
223 223
224 conf->starttls_capability.len = size; 224 conf->starttls_capability.len = size;
231 231
232 232
233 size = (auth - conf->capability.data) + sizeof(CRLF) - 1 233 size = (auth - conf->capability.data) + sizeof(CRLF) - 1
234 + sizeof(" STARTTLS LOGINDISABLED") - 1; 234 + sizeof(" STARTTLS LOGINDISABLED") - 1;
235 235
236 p = ngx_palloc(cf->pool, size); 236 p = ngx_pnalloc(cf->pool, size);
237 if (p == NULL) { 237 if (p == NULL) {
238 return NGX_CONF_ERROR; 238 return NGX_CONF_ERROR;
239 } 239 }
240 240
241 conf->starttls_only_capability.len = size; 241 conf->starttls_only_capability.len = size;