Mercurial > hg > nginx

comparison src/mail/ngx_mail_pop3_handler.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 e584e946e198
children 722b5aff05ae
comparison
equal deleted inserted replaced
2048:824615f3b4ec 2049:2a92804f4109
44 if (ngx_mail_salt(s, c, cscf) != NGX_OK) { 44 if (ngx_mail_salt(s, c, cscf) != NGX_OK) {
45 ngx_mail_session_internal_server_error(s); 45 ngx_mail_session_internal_server_error(s);
46 return; 46 return;
47 } 47 }
48 48
49 s->out.data = ngx_palloc(c->pool, sizeof(pop3_greeting) + s->salt.len); 49 s->out.data = ngx_pnalloc(c->pool, sizeof(pop3_greeting) + s->salt.len);
50 if (s->out.data == NULL) { 50 if (s->out.data == NULL) {
51 ngx_mail_session_internal_server_error(s); 51 ngx_mail_session_internal_server_error(s);
52 return; 52 return;
53 } 53 }
54 54
295 return NGX_MAIL_PARSE_INVALID_COMMAND; 295 return NGX_MAIL_PARSE_INVALID_COMMAND;
296 } 296 }
297 297
298 arg = s->args.elts; 298 arg = s->args.elts;
299 s->login.len = arg[0].len; 299 s->login.len = arg[0].len;
300 s->login.data = ngx_palloc(c->pool, s->login.len); 300 s->login.data = ngx_pnalloc(c->pool, s->login.len);
301 if (s->login.data == NULL) { 301 if (s->login.data == NULL) {
302 return NGX_ERROR; 302 return NGX_ERROR;
303 } 303 }
304 304
305 ngx_memcpy(s->login.data, arg[0].data, s->login.len); 305 ngx_memcpy(s->login.data, arg[0].data, s->login.len);
322 return NGX_MAIL_PARSE_INVALID_COMMAND; 322 return NGX_MAIL_PARSE_INVALID_COMMAND;
323 } 323 }
324 324
325 arg = s->args.elts; 325 arg = s->args.elts;
326 s->passwd.len = arg[0].len; 326 s->passwd.len = arg[0].len;
327 s->passwd.data = ngx_palloc(c->pool, s->passwd.len); 327 s->passwd.data = ngx_pnalloc(c->pool, s->passwd.len);
328 if (s->passwd.data == NULL) { 328 if (s->passwd.data == NULL) {
329 return NGX_ERROR; 329 return NGX_ERROR;
330 } 330 }
331 331
332 ngx_memcpy(s->passwd.data, arg[0].data, s->passwd.len); 332 ngx_memcpy(s->passwd.data, arg[0].data, s->passwd.len);
415 } 415 }
416 416
417 arg = s->args.elts; 417 arg = s->args.elts;
418 418
419 s->login.len = arg[0].len; 419 s->login.len = arg[0].len;
420 s->login.data = ngx_palloc(c->pool, s->login.len); 420 s->login.data = ngx_pnalloc(c->pool, s->login.len);
421 if (s->login.data == NULL) { 421 if (s->login.data == NULL) {
422 return NGX_ERROR; 422 return NGX_ERROR;
423 } 423 }
424 424
425 ngx_memcpy(s->login.data, arg[0].data, s->login.len); 425 ngx_memcpy(s->login.data, arg[0].data, s->login.len);
426 426
427 s->passwd.len = arg[1].len; 427 s->passwd.len = arg[1].len;
428 s->passwd.data = ngx_palloc(c->pool, s->passwd.len); 428 s->passwd.data = ngx_pnalloc(c->pool, s->passwd.len);
429 if (s->passwd.data == NULL) { 429 if (s->passwd.data == NULL) {
430 return NGX_ERROR; 430 return NGX_ERROR;
431 } 431 }
432 432
433 ngx_memcpy(s->passwd.data, arg[1].data, s->passwd.len); 433 ngx_memcpy(s->passwd.data, arg[1].data, s->passwd.len);