git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TLS: PIPELINING under OpenSSL
[exim.git]
/
src
/
src
/
verify.c
diff --git
a/src/src/verify.c
b/src/src/verify.c
index e46d2020bd76d006de3572225c2389df8103cfa1..3a8f9b6bc97af3de252cf5fe334668f91eb00f42 100644
(file)
--- a/
src/src/verify.c
+++ b/
src/src/verify.c
@@
-1177,7
+1177,7
@@
if(cutthrough.fd < 0)
if(
#ifdef SUPPORT_TLS
if(
#ifdef SUPPORT_TLS
-
(tls_out.active == cutthrough.fd) ? tls_write(FALSE, ctblock.buffer, n
) :
+
tls_out.active == cutthrough.fd ? tls_write(FALSE, ctblock.buffer, n, FALSE
) :
#endif
send(cutthrough.fd, ctblock.buffer, n, 0) > 0
)
#endif
send(cutthrough.fd, ctblock.buffer, n, 0) > 0
)
@@
-1344,6
+1344,7
@@
tctx.tblock = cutthrough.addr.transport;
tctx.addr = &cutthrough.addr;
tctx.check_string = US".";
tctx.escape_string = US"..";
tctx.addr = &cutthrough.addr;
tctx.check_string = US".";
tctx.escape_string = US"..";
+/*XXX check under spool_files_wireformat. Might be irrelevant */
tctx.options = topt_use_crlf;
if (!transport_headers_send(&tctx, &cutthrough_write_chunk))
tctx.options = topt_use_crlf;
if (!transport_headers_send(&tctx, &cutthrough_write_chunk))
@@
-1395,6
+1396,7
@@
cutthrough.delivery = cutthrough.callout_hold_only = FALSE;
void
release_cutthrough_connection(const uschar * why)
{
void
release_cutthrough_connection(const uschar * why)
{
+if (cutthrough.fd < 0) return;
HDEBUG(D_acl) debug_printf_indent("release cutthrough conn: %s\n", why);
cutthrough.fd = -1;
cutthrough.delivery = cutthrough.callout_hold_only = FALSE;
HDEBUG(D_acl) debug_printf_indent("release cutthrough conn: %s\n", why);
cutthrough.fd = -1;
cutthrough.delivery = cutthrough.callout_hold_only = FALSE;
@@
-1515,7
+1517,7
@@
va_list ap;
va_start(ap, format);
if (smtp_out && (f == smtp_out))
va_start(ap, format);
if (smtp_out && (f == smtp_out))
- smtp_vprintf(format, ap);
+ smtp_vprintf(format,
FALSE,
ap);
else
vfprintf(f, format, ap);
va_end(ap);
else
vfprintf(f, format, ap);
va_end(ap);