Merge from trunk

diff --cc doc/release-notes/release-3.2.sgml
Simple merge

diff --cc src/Makefile.am
Simple merge

diff --cc src/adaptation/icap/ModXact.cc
Simple merge

diff --cc src/cache_cf.cc
Simple merge

diff --cc src/cf.data.pre
Simple merge

diff --cc src/client_side.cc
Simple merge

diff --cc src/client_side_reply.cc
Simple merge

diff --cc src/client_side_request.cc
Simple merge

diff --cc src/comm.cc
Simple merge

diff --cc src/errorpage.cc
index 7c4205e120b50825737bd63b6ba9e32e08e384af,bcc3e2e966167eb213ab7e395c6eb53ae6a80eb6..2b238d6eff02d6175b7abc576cd28ae913421ed3
--- 1/src/errorpage.cc
--- 2/src/errorpage.cc
+++ b/src/errorpage.cc
@@@ -457,9 -456,11 +457,9 @@@ errorSend(const Comm::ConnectionPointe
      err->flags.flag_cbdata = 1;
  
      rep = err->BuildHttpReply();
- 
-     comm_write_mbuf(conn, rep->pack(), errorSendComplete, err);
--
+     MemBuf *mb = rep->pack();
 -    comm_write_mbuf(fd, mb, errorSendComplete, err);
++    comm_write_mbuf(conn, mb, errorSendComplete, err);
+     delete mb;
 -
      delete rep;
  }
  

diff --cc src/ftp.cc
Simple merge

diff --cc src/helper.cc
index 2e0b5883c9379b5d6bb2f88a5756404a5a568747,c159c35756b7fff4998f7fa20b2292854b96b61c..10251bb4f4959f7d98c4c32ecab0240dcfaf8343
--- 1/src/helper.cc
--- 2/src/helper.cc
+++ b/src/helper.cc
@@@ -687,23 -687,8 +687,8 @@@ helperServerFree(int fd, void *data
          srv->writebuf = NULL;
      }
  
-     for (i = 0; i < concurrency; i++) {
-         if ((r = srv->requests[i])) {
-             void *cbdata;
- 
-             if (cbdataReferenceValidDone(r->data, &cbdata))
-                 r->callback(cbdata, NULL);
- 
-             helperRequestFree(r);
- 
-             srv->requests[i] = NULL;
-         }
-     }
- 
-     safe_free(srv->requests);
- 
 -    if (srv->wfd != srv->rfd && srv->wfd != -1)
 -        comm_close(srv->wfd);
 +    if (Comm::IsConnOpen(srv->writePipe))
 +        srv->closeWritePipeSafely();
  
      dlinkDelete(&srv->link, &hlp->servers);
  
@@@ -749,20 -748,9 +748,9 @@@ helperStatefulServerFree(int fd, void *
  
  #endif
  
-     if ((r = srv->request)) {
-         void *cbdata;
- 
-         if (cbdataReferenceValidDone(r->data, &cbdata))
-             r->callback(cbdata, srv, NULL);
- 
-         helperStatefulRequestFree(r);
- 
-         srv->request = NULL;
-     }
- 
      /* TODO: walk the local queue of requests and carry them all out */
 -    if (srv->wfd != srv->rfd && srv->wfd != -1)
 -        comm_close(srv->wfd);
 +    if (Comm::IsConnOpen(srv->writePipe))
 +        srv->closeWritePipeSafely();
  
      dlinkDelete(&srv->link, &hlp->servers);
  

diff --cc src/http.cc
index 08d676e8487cc06820cc1a833ed7eea03e7d744f,772f92cf099478b252508da5bf22b15b5b0d9bd1..f043d9dd0e798b96477536eb18ec690b3523670e
--- 1/src/http.cc
--- 2/src/http.cc
+++ b/src/http.cc
@@@ -2126,10 -2130,10 +2129,9 @@@ HttpStateData::sendRequest(
  
      mb.init();
      request->peer_host=_peer?_peer->host:NULL;
-     buildRequestPrefix(request, orig_request, entry, &mb, flags);
+     buildRequestPrefix(request, orig_request, entry, &mb);
 -    debugs(11, 6, "httpSendRequest: FD " << fd << ":\n" << mb.buf);
 -    comm_write_mbuf(fd, &mb, requestSender);
 -
 +    debugs(11, 6, HERE << serverConnection << ":\n" << mb.buf);
 +    comm_write_mbuf(serverConnection, &mb, requestSender);
- 
      return true;
  }
  
@@@ -2244,13 -2249,12 +2246,12 @@@ voi
  HttpStateData::doneSendingRequestBody()
  {
      ServerStateData::doneSendingRequestBody();
 -    debugs(11,5, HERE << "doneSendingRequestBody: FD " << fd);
 +    debugs(11,5, HERE << serverConnection);
  
      // do we need to write something after the last body byte?
-     const bool chunked = request->header.chunked();
-     if (chunked && finishingChunkedRequest())
+     if (flags.chunked_request && finishingChunkedRequest())
          return;
-     if (!chunked && finishingBrokenPost())
+     if (!flags.chunked_request && finishingBrokenPost())
          return;
  
      sendComplete();

diff --cc src/http.h
index 97b4a393d6042541703a948711407fe104c6bd3f,c0f7d051b2ce459f29efa3c06b1ffaa6fba48e16..f838e2acc8b99234116b168e26b65deb7d94a5b5
--- 1/src/http.h
--- 2/src/http.h
+++ b/src/http.h
@@@ -52,9 -51,9 +52,9 @@@ public
                                         HttpRequest * orig_request,
                                         StoreEntry * entry,
                                         HttpHeader * hdr_out,
-                                        http_state_flags flags);
+                                        const http_state_flags flags);
  
 -    virtual int dataDescriptor() const;
 +    virtual const Comm::ConnectionPointer & dataDescriptor() const;
      /* should be private */
      bool sendRequest();
      void processReplyHeader();

diff --cc src/icp_v2.cc
Simple merge

diff --cc src/main.cc
index 7ba9d9bc89169caed0d371f02451cb1899e39a09,0865e3c7855a4159d3a66df8af2d6097a2e7d24a..2b0848677b51e4554405e520824252d87fd2b0dd
--- 1/src/main.cc
--- 2/src/main.cc
+++ b/src/main.cc
@@@ -62,27 -73,13 +62,28 @@@
  #if defined(USE_SELECT) || defined(USE_SELECT_WIN32)
  #include "comm_select.h"
  #endif
 -#include "SquidTime.h"
 -#include "SwapDir.h"
 +#include "ConfigParser.h"
++#include "CpuAffinity.h"
 +#include "DiskIO/DiskIOModule.h"
 +#include "errorpage.h"
 +#if USE_SQUID_ESI
 +#include "esi/Module.h"
 +#endif
 +#include "event.h"
 +#include "EventLoop.h"
 +#include "ExternalACL.h"
  #include "forward.h"
 -#include "MemPool.h"
 +#include "fs/Module.h"
 +#include "htcp.h"
 +#include "HttpReply.h"
  #include "icmp/IcmpSquid.h"
  #include "icmp/net_db.h"
 -
 +#include "ICP.h"
 +#include "ident/Ident.h"
 +#include "ip/tools.h"
 +#include "ipc/Coordinator.h"
 +#include "ipc/Kids.h"
 +#include "ipc/Strand.h"
  #if USE_LOADABLE_MODULES
  #include "LoadableModules.h"
  #endif

diff --cc src/neighbors.cc
Simple merge

diff --cc src/protos.h
Simple merge

diff --cc src/stat.cc
Simple merge

diff --cc src/store.cc
Simple merge

diff --cc src/structs.h
Simple merge

diff --cc src/tools.cc
Simple merge

diff --cc src/typedefs.h
Simple merge