diff options
| author | gshapiro <gshapiro@FreeBSD.org> | 2008-08-28 06:08:29 +0000 |
|---|---|---|
| committer | gshapiro <gshapiro@FreeBSD.org> | 2008-08-28 06:08:29 +0000 |
| commit | b1e5c9c5e51c0569a82ee5838ed755e3c7bae94f (patch) | |
| tree | 45eaace561ffa22220b192fa6cc9bd930b44ffb6 /contrib/sendmail/src/collect.c | |
| parent | db890a1eb5b814a0367ca9de9f9a8f211f1231e7 (diff) | |
| download | FreeBSD-src-b1e5c9c5e51c0569a82ee5838ed755e3c7bae94f.zip FreeBSD-src-b1e5c9c5e51c0569a82ee5838ed755e3c7bae94f.tar.gz | |
Merge sendmail 8.14.3 into HEAD.
Note: As the first merge since the conversion to svn, it includes many
propset changes to get the proper svn:eol-style and svn:mime-type on the
files (as merged from the fixed up vendor/dist area).
MFC after: 3 days
Diffstat (limited to 'contrib/sendmail/src/collect.c')
| -rw-r--r-- | contrib/sendmail/src/collect.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/contrib/sendmail/src/collect.c b/contrib/sendmail/src/collect.c index 56fed0a..0a2cdab 100644 --- a/contrib/sendmail/src/collect.c +++ b/contrib/sendmail/src/collect.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998-2006 Sendmail, Inc. and its suppliers. + * Copyright (c) 1998-2006, 2008 Sendmail, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved. * Copyright (c) 1988, 1993 @@ -13,7 +13,7 @@ #include <sendmail.h> -SM_RCSID("@(#)$Id: collect.c,v 8.280 2006/11/29 00:20:40 ca Exp $") +SM_RCSID("@(#)$Id: collect.c,v 8.282 2008/01/31 18:48:29 ca Exp $") static void eatfrom __P((char *volatile, ENVELOPE *)); static void collect_doheader __P((ENVELOPE *)); @@ -308,6 +308,7 @@ collect(fp, smtpmode, hdrp, e, rsetsize) dbto = smtpmode ? ((int) TimeOuts.to_datablock * 1000) : SM_TIME_FOREVER; sm_io_setinfo(fp, SM_IO_WHAT_TIMEOUT, &dbto); + set_tls_rd_tmo(TimeOuts.to_datablock); c = SM_IO_EOF; inputerr = false; headeronly = hdrp != NULL; |
