summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2018-10-20 21:03:22 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2018-10-21 15:32:39 +0100
commit0768462dc5830cde5ae7a3659577fb557926db28 (patch)
tree7dbab121cea518ba75349c4830fcfec07c60173d
parent099afc4f7362d39816cb3555127214548dd9cb35 (diff)
tidying
-rw-r--r--doc/doc-txt/ChangeLog2
-rw-r--r--src/src/deliver.c6
2 files changed, 3 insertions, 5 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 3a98e0384..414dd9810 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -509,7 +509,7 @@ JH/26 Fix DKIM bug: when the pseudoheader generated for signing was exactly
line, the header hash was calculated to an incorrect value thanks to
the (relaxed) space the fold became.
-HS/02 Fix Bug 2130: large writes from the transport subprocess where chunked
+HS/02 Fix Bug 2130: large writes from the transport subprocess were chunked
and confused the parent.
JH/27 Fix SOCKS bug: an unitialized pointer was deref'd by the transport process
diff --git a/src/src/deliver.c b/src/src/deliver.c
index 24c4048f6..6c6e6f7d1 100644
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -3315,8 +3315,8 @@ small items (less than PIPE_BUF, which seems to be at least 512 in any Unix and
often bigger) so even if we are reading while the subprocess is still going, we
should never have only a partial item in the buffer.
-hs12: This assumption is not true anymore, since we got quit large items (certificate
-information and such)
+hs12: This assumption is not true anymore, since we get quite large items (certificate
+information and such).
Argument:
poffset the offset of the parlist item
@@ -4685,12 +4685,10 @@ all pipes, so I do not see a reason to use non-blocking IO here
search_tidyup();
-
if ((pid = fork()) == 0)
{
int fd = pfd[pipe_write];
host_item *h;
- DEBUG(D_deliver) debug_selector |= D_pid; // hs12
/* Setting this global in the subprocess means we need never clear it */
transport_name = tp->name;