tidying

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 3a98e0384c387bdec8b70b6c79cdb0879e7447a1..414dd9810fcdaf3e1df5f7f1998d5b50a332989c 100644 (file)
--- 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.
 
       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
       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 24c4048f6cbcb39a6ecef6dbc62fc35fe16b16d8..6c6e6f7d12ef8a03dec8e483e9f7aeabc3b8f666 100644 (file)
--- 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.
 
 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
 
 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();
 
 
   search_tidyup();
 

-

   if ((pid = fork()) == 0)
     {
     int fd = pfd[pipe_write];
     host_item *h;
   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;
 
     /* Setting this global in the subprocess means we need never clear it */
     transport_name = tp->name;