From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 2 Jun 2014 15:11:59 +0000 (-0700)
Subject: Fix regression in mime header boundary detection
X-Git-Tag: merge-candidate-3-v1~506^2~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38012e61ac7f8efa0f9b395cc333fe73b29e93e5;p=thirdparty%2Fsquid.git

Fix regression in mime header boundary detection
---

diff --git a/src/http/one/RequestParser.cc b/src/http/one/RequestParser.cc
index 9e8ba8aa59..87bbfdcc81 100644
--- a/src/http/one/RequestParser.cc
+++ b/src/http/one/RequestParser.cc
@@ -344,8 +344,8 @@ Http::One::RequestParser::parse(const SBuf &aBuf)
                     debugs(33, 5, "Incomplete request, waiting for end of headers");
                 return false;
             }
-            mimeHeaderBlock_ = buf_.substr(req.end+1, mimeHeaderBytes);
-            buf_.consume(mimeHeaderBytes); // done with these bytes now.
+            mimeHeaderBlock_ = buf_.consume(mimeHeaderBytes);
+            debugs(74, 5, "mime header (0-" << mimeHeaderBytes << ") {" << mimeHeaderBlock_ << "}");
 
         } else
             debugs(33, 3, "Missing HTTP/1.x identifier");