From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 2 Jun 2014 07:29:17 +0000 (-0700)
Subject: Merge from trunk
X-Git-Tag: merge-candidate-3-v1~506^2~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53af97a997d2061545e9e9419c414c59a9293c78;p=thirdparty%2Fsquid.git

Merge from trunk
---

53af97a997d2061545e9e9419c414c59a9293c78
diff --cc src/client_side.cc
index 5e8a3087d4,0cb7be8d1f..6cfd245445
--- a/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,