Mercurial > hg > nginx-ranges

comparison src/mail/ngx_mail_proxy_module.c @ 635:e67b227c8dbb default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with current.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 25 Apr 2011 04:07:55 +0400
parents 8246d8a2c2be
children
comparison
equal deleted inserted replaced
578:f3a9e57d2e17 635:e67b227c8dbb
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) {
662 660
663 return; 661 return;
664 662
665 default: 663 default:
666 #if (NGX_SUPPRESS_WARN) 664 #if (NGX_SUPPRESS_WARN)
667 line.len = 0; 665 ngx_str_null(&line);
668 line.data = NULL;
669 #endif 666 #endif
670 break; 667 break;
671 } 668 }
672 669
673 if (c->send(c, line.data, line.len) < (ssize_t) line.len) { 670 if (c->send(c, line.data, line.len) < (ssize_t) line.len) {
724 return NGX_AGAIN; 721 return NGX_AGAIN;
725 } 722 }
726 723
727 b->last += n; 724 b->last += n;
728 725
729 if (b->last - b->pos < 5) { 726 if (b->last - b->pos < 4) {
730 return NGX_AGAIN; 727 return NGX_AGAIN;
731 } 728 }
732 729
733 if (*(b->last - 2) != CR || *(b->last - 1) != LF) { 730 if (*(b->last - 2) != CR || *(b->last - 1) != LF) {
734 if (b->last == b->end) { 731 if (b->last == b->end) {