comparison src/mail/ngx_mail_pop3_module.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 f69493e8faab
children d620f497c50f
comparison
equal deleted inserted replaced
2048:824615f3b4ec 2049:2a92804f4109
181 181
182 } else { 182 } else {
183 size += sizeof("SASL LOGIN PLAIN" CRLF) - 1; 183 size += sizeof("SASL LOGIN PLAIN" CRLF) - 1;
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;
211 *p++ = '.'; *p++ = CR; *p = LF; 211 *p++ = '.'; *p++ = CR; *p = LF;
212 212
213 213
214 size += sizeof("STLS" CRLF) - 1; 214 size += sizeof("STLS" CRLF) - 1;
215 215
216 p = ngx_palloc(cf->pool, size); 216 p = ngx_pnalloc(cf->pool, size);
217 if (p == NULL) { 217 if (p == NULL) {
218 return NGX_CONF_ERROR; 218 return NGX_CONF_ERROR;
219 } 219 }
220 220
221 conf->starttls_capability.len = size; 221 conf->starttls_capability.len = size;
234 } else { 234 } else {
235 conf->auth_capability = ngx_mail_pop3_auth_plain_capability; 235 conf->auth_capability = ngx_mail_pop3_auth_plain_capability;
236 } 236 }
237 237
238 238
239 p = ngx_palloc(cf->pool, stls_only_size); 239 p = ngx_pnalloc(cf->pool, stls_only_size);
240 if (p == NULL) { 240 if (p == NULL) {
241 return NGX_CONF_ERROR; 241 return NGX_CONF_ERROR;
242 } 242 }
243 243
244 conf->starttls_only_capability.len = stls_only_size; 244 conf->starttls_only_capability.len = stls_only_size;