Merge cleanup changes from trunk

diff --cc configure.ac
Simple merge

diff --cc src/client_side.cc
index 84f9cde2f6464874c0fe49090a2170b26622e57e,b5a00a35273a77575407ea661b43957228eecf21..8e14db0f9229c0e0b6af98a8a186d42d18c5d567
--- 1/src/client_side.cc
--- 2/src/client_side.cc
+++ b/src/client_side.cc
@@@ -2255,18 -2294,24 +2246,18 @@@ parseHttpRequest(ConnStateData *csd, Ht
       * Process headers after request line
       * TODO: Use httpRequestParse here.
       */
 -    /* XXX this code should be modified to take a const char * later! */
 -    req_hdr = (char *) hp->buf + hp->req.end + 1;
 -
 -    debugs(33, 3, "parseHttpRequest: req_hdr = {" << req_hdr << "}");
 -
 -    end = (char *) hp->buf + hp->hdr_end;
 -
 -    debugs(33, 3, "parseHttpRequest: end = {" << end << "}");
 -
 -    debugs(33, 3, "parseHttpRequest: prefix_sz = " <<
 -           (int) HttpParserRequestLen(hp) << ", req_line_sz = " <<
 -           HttpParserReqSz(hp));
 +    debugs(33, 3, Raw("req_hdr", hp.rawHeaderBuf(), hp.headerBlockSize()));
 +    debugs(33, 3, "prefix_sz = " << hp.messageHeaderSize() <<
 +           ", request-line-size=" << hp.firstLineSize() <<
 +           ", mime-header-size=" << hp.headerBlockSize());
  
      /* Ok, all headers are received */
 -    http = new ClientHttpRequest(csd);
 +    ClientHttpRequest *http = new ClientHttpRequest(csd);
 +
 +    http->req_sz = hp.messageHeaderSize();
-     ClientSocketContext *result = ClientSocketContextNew(csd->clientConnection, http);
++    ClientSocketContext *result = new ClientSocketContext(csd->clientConnection, http);
  
 -    http->req_sz = HttpParserRequestLen(hp);
 -    result = new ClientSocketContext(csd->clientConnection, http);
 +    StoreIOBuffer tempBuffer;
      tempBuffer.data = result->reqbuf;
      tempBuffer.length = HTTP_REQBUF_SZ;
  

diff --cc src/client_side.h
Simple merge

diff --cc src/tests/stub_client_side.cc
Simple merge