Merge from trunk

diff --cc src/HttpHeaderTools.cc
Simple merge

diff --cc src/HttpMsg.h
Simple merge

diff --cc src/cache_cf.cc
Simple merge

diff --cc src/client_side.cc
index 5e8a3087d471e89f1c9a45909815ea57653ec5f5,0cb7be8d1f2285b47f9d9431f3d21320c57b1c13..6cfd24544591d1febe7d0fb751757d0b8282c9f5
--- 1/src/client_side.cc
--- 2/src/client_side.cc
+++ b/src/client_side.cc
@@@ -2534,9 -2619,9 +2534,10 @@@ clientProcessRequest(ConnStateData *con
          setLogUri(http, http->uri,  true);
          clientReplyContext *repContext = dynamic_cast<clientReplyContext *>(node->data.getRaw());
          assert (repContext);
 -        switch (hp->request_parse_status) {
 +        switch (hp.request_parse_status) {
          case Http::scHeaderTooLarge:
--            repContext->setReplyToError(ERR_TOO_BIG, Http::scBadRequest, method, http->uri, conn->clientConnection->remote, NULL, conn->in.buf.c_str(), NULL);
++            repContext->setReplyToError(ERR_TOO_BIG, Http::scBadRequest, method, http->uri,
++                                        conn->clientConnection->remote, NULL, conn->in.buf.c_str(), NULL);
              break;
          case Http::scMethodNotAllowed:
              repContext->setReplyToError(ERR_UNSUP_REQ, Http::scMethodNotAllowed, method, http->uri,