From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 6 May 2014 15:30:17 +0000 (-0700)
Subject: Fix build errors after trunk merge
X-Git-Tag: merge-candidate-3-v1~506^2~47
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d477ce03e2aed12db3ff5d759c07155c9607dd27;p=thirdparty%2Fsquid.git

Fix build errors after trunk merge
---

diff --git a/src/acl/MethodData.cc b/src/acl/MethodData.cc
index 6fad15ef90..495e89c822 100644
--- a/src/acl/MethodData.cc
+++ b/src/acl/MethodData.cc
@@ -36,7 +36,7 @@
 #include "acl/Checklist.h"
 #include "acl/MethodData.h"
 #include "cache_cf.h"
-#include "HttpRequestMethod.h"
+#include "http/RequestMethod.h"
 
 int ACLMethodData::ThePurgeCount = 0;
 
diff --git a/src/client_side.cc b/src/client_side.cc
index 6f4b9cb580..a4de94b376 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -2542,10 +2542,10 @@ clientProcessRequest(ConnStateData *conn, Http1::RequestParser &hp, ClientSocket
             break;
         case Http::scHttpVersionNotSupported:
             repContext->setReplyToError(ERR_UNSUP_HTTPVERSION, Http::scHttpVersionNotSupported, method, http->uri,
-                                        conn->clientConnection->remote, NULL, conn->in.buf, NULL);
+                                        conn->clientConnection->remote, NULL, conn->in.buf.c_str(), NULL);
             break;
         default:
-            repContext->setReplyToError(ERR_INVALID_REQ, hp->request_parse_status, method, http->uri,
+            repContext->setReplyToError(ERR_INVALID_REQ, hp.request_parse_status, method, http->uri,
                                         conn->clientConnection->remote, NULL, conn->in.buf.c_str(), NULL);
         }
         assert(context->http->out.offset == 0);
@@ -2713,10 +2713,6 @@ clientProcessRequest(ConnStateData *conn, Http1::RequestParser &hp, ClientSocket
     if (http->request->method == Http::METHOD_CONNECT) {
         context->mayUseConnection(true);
         conn->flags.readMore = false;
-
-        // consume header early so that tunnel gets just the body
-        connNoteUseOfBuffer(conn, http->req_sz);
-        notedUseOfBuffer = true;
     }
 
 #if USE_OPENSSL