diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2018-12-29 19:27:20 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2019-02-10 23:22:50 +0000 |
| commit | 2aaa3cdd22a987cbf7c8343d3e6103ee521296dc (patch) | |
| tree | c27a827b2e1f7739283dd72d7189c755e919d595 | |
| parent | ac35befe29020ebd38c62a7dd48f7977a0856048 (diff) | |
Use single TCP segment for SMTP, TLS and TCP closes.
(cherry picked from commit a7846940c876fd2a76b89240aa83e7083ae9650a)
| -rw-r--r-- | src/src/smtp_in.c | 5 | ||||
| -rw-r--r-- | src/src/transports/smtp.c | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c index a238ae261..b071298c7 100644 --- a/src/src/smtp_in.c +++ b/src/src/smtp_in.c @@ -3822,6 +3822,11 @@ if (acl_smtp_quit) log_write(0, LOG_MAIN|LOG_PANIC, "ACL for QUIT returned ERROR: %s", *log_msgp); } + +#ifdef TCP_CORK +(void) setsockopt(fileno(smtp_out), IPPROTO_TCP, TCP_CORK, US &on, sizeof(on)); +#endif + if (*user_msgp) smtp_respond(US"221", 3, TRUE, *user_msgp); else diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c index 98ab00282..c1cba598c 100644 --- a/src/src/transports/smtp.c +++ b/src/src/transports/smtp.c @@ -4330,6 +4330,9 @@ This change is being made on 31-Jul-98. After over a year of trouble-free operation, the old commented-out code was removed on 17-Sep-99. */ SEND_QUIT: +#ifdef TCP_CORK +(void) setsockopt(sx.cctx.sock, IPPROTO_TCP, TCP_CORK, US &on, sizeof(on)); +#endif if (sx.send_quit) (void)smtp_write_command(&sx, SCMD_FLUSH, "QUIT\r\n"); END_OFF: |