Mercurial > hg > nginx-mail
comparison src/mail/ngx_mail_proxy_module.c @ 665:0b460e61bdcd default tip
Merge with nginx 1.0.0.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 25 Apr 2011 04:22:17 +0400 |
parents | 9773720b845e 8246d8a2c2be |
children |
comparison
equal
deleted
inserted
replaced
572:06419a2298a9 | 665:0b460e61bdcd |
---|---|
106 | 106 |
107 static u_char smtp_auth_ok[] = "235 2.0.0 OK" CRLF; | 107 static u_char smtp_auth_ok[] = "235 2.0.0 OK" CRLF; |
108 | 108 |
109 | 109 |
110 void | 110 void |
111 ngx_mail_proxy_init(ngx_mail_session_t *s, ngx_peer_addr_t *peer) | 111 ngx_mail_proxy_init(ngx_mail_session_t *s, ngx_addr_t *peer) |
112 { | 112 { |
113 int keepalive; | 113 int keepalive; |
114 ngx_int_t rc; | 114 ngx_int_t rc; |
115 ngx_mail_proxy_ctx_t *p; | 115 ngx_mail_proxy_ctx_t *p; |
116 ngx_mail_proxy_conf_t *pcf; | 116 ngx_mail_proxy_conf_t *pcf; |
302 | 302 |
303 return; | 303 return; |
304 | 304 |
305 default: | 305 default: |
306 #if (NGX_SUPPRESS_WARN) | 306 #if (NGX_SUPPRESS_WARN) |
307 line.len = 0; | 307 ngx_str_null(&line); |
308 line.data = NULL; | |
309 #endif | 308 #endif |
310 break; | 309 break; |
311 } | 310 } |
312 | 311 |
313 if (c->send(c, line.data, line.len) < (ssize_t) line.len) { | 312 if (c->send(c, line.data, line.len) < (ssize_t) line.len) { |
437 | 436 |
438 return; | 437 return; |
439 | 438 |
440 default: | 439 default: |
441 #if (NGX_SUPPRESS_WARN) | 440 #if (NGX_SUPPRESS_WARN) |
442 line.len = 0; | 441 ngx_str_null(&line); |
443 line.data = NULL; | |
444 #endif | 442 #endif |
445 break; | 443 break; |
446 } | 444 } |
447 | 445 |
448 if (c->send(c, line.data, line.len) < (ssize_t) line.len) { | 446 if (c->send(c, line.data, line.len) < (ssize_t) line.len) { |
667 | 665 |
668 return; | 666 return; |
669 | 667 |
670 default: | 668 default: |
671 #if (NGX_SUPPRESS_WARN) | 669 #if (NGX_SUPPRESS_WARN) |
672 line.len = 0; | 670 ngx_str_null(&line); |
673 line.data = NULL; | |
674 #endif | 671 #endif |
675 break; | 672 break; |
676 } | 673 } |
677 | 674 |
678 if (c->send(c, line.data, line.len) < (ssize_t) line.len) { | 675 if (c->send(c, line.data, line.len) < (ssize_t) line.len) { |
729 return NGX_AGAIN; | 726 return NGX_AGAIN; |
730 } | 727 } |
731 | 728 |
732 b->last += n; | 729 b->last += n; |
733 | 730 |
734 if (b->last - b->pos < 5) { | 731 if (b->last - b->pos < 4) { |
735 return NGX_AGAIN; | 732 return NGX_AGAIN; |
736 } | 733 } |
737 | 734 |
738 if (*(b->last - 2) != CR || *(b->last - 1) != LF) { | 735 if (*(b->last - 2) != CR || *(b->last - 1) != LF) { |
739 if (b->last == b->end) { | 736 if (b->last == b->end) { |