From: Automatic source maintenance <squidadm@squid-cache.org>
Date: Tue, 15 Jun 2010 07:21:57 +0000 (-0600)
Subject: Bootstrapped
X-Git-Tag: SQUID_3_2_0_1~138
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ddcfbab8e66e58260e9e0df36885f4bac4810ba;p=thirdparty%2Fsquid.git

Bootstrapped
---

diff --git a/src/ChunkedCodingParser.cc b/src/ChunkedCodingParser.cc
index 66e80ce134..80001f6611 100644
--- a/src/ChunkedCodingParser.cc
+++ b/src/ChunkedCodingParser.cc
@@ -240,12 +240,12 @@ void ChunkedCodingParser::parseChunkExtension(const char *startExt, const char *
     for (const char *p = startExt; p < endExt;) {
 
         while (*p == ' ' || *p == '\t') ++p; // skip spaces before ';'
-        
+
         if (*p++ != ';') // each ext name=value pair is preceded with ';'
             return;
-        
+
         while (*p == ' ' || *p == '\t') ++p; // skip spaces before name
-        
+
         if (p >= endExt)
             return; // malformed extension: ';' without ext name=value pair
 
diff --git a/src/adaptation/icap/ModXact.cc b/src/adaptation/icap/ModXact.cc
index 1fcccd70b4..9fc83837c3 100644
--- a/src/adaptation/icap/ModXact.cc
+++ b/src/adaptation/icap/ModXact.cc
@@ -934,7 +934,7 @@ void Adaptation::Icap::ModXact::prepPartialBodyEchoing(uint64_t pos)
 
     // check that use-original-body=N does not point beyond buffered data
     const uint64_t virginDataEnd = virginConsumed +
-        virgin.body_pipe->buf().contentSize();
+                                   virgin.body_pipe->buf().contentSize();
     Must(pos <= virginDataEnd);
     virginBodySending.progress(static_cast<size_t>(pos));
 
@@ -1338,7 +1338,7 @@ void Adaptation::Icap::ModXact::makeAllowHeader(MemBuf &buf)
     const bool allow206out = state.allowedPostview206 = shouldAllow206out();
 
     debugs(93,9, HERE << "Allows: " << allow204in << allow204out <<
-        allow206in << allow206out);
+           allow206in << allow206out);
 
     const bool allow204 = allow204in || allow204out;
     const bool allow206 = allow206in || allow206out;
@@ -1360,7 +1360,7 @@ void Adaptation::Icap::ModXact::makeAllowHeader(MemBuf &buf)
         allowHeader = "Allow: 204\r\n";
     else if (allow206)
         allowHeader = "Allow: 206\r\n";
-    
+
     if (allowHeader) { // may be nil if only allow204in is true
         buf.append(allowHeader, strlen(allowHeader));
         debugs(93,5, HERE << "Will write " << allowHeader);
@@ -1473,7 +1473,7 @@ bool Adaptation::Icap::ModXact::shouldAllow204()
 bool Adaptation::Icap::ModXact::shouldAllow206any()
 {
     return TheConfig.allow206_enable && service().allows206() &&
-        virginBody.expected(); // no need for 206 without a body
+           virginBody.expected(); // no need for 206 without a body
 }
 
 // decides whether to allow 206 responses in preview mode
diff --git a/src/adaptation/icap/ModXact.h b/src/adaptation/icap/ModXact.h
index 7ee51a0f70..1eb5cc7b24 100644
--- a/src/adaptation/icap/ModXact.h
+++ b/src/adaptation/icap/ModXact.h
@@ -297,8 +297,8 @@ private:
         // will not use virgin.body_pipe
         bool doneConsumingVirgin() const {
             return writing >= writingAlmostDone
-                && ((sending == sendingAdapted && !readyForUob) ||
-                    sending == sendingDone);
+                   && ((sending == sendingAdapted && !readyForUob) ||
+                       sending == sendingDone);
         }
 
         // parsed entire ICAP response from the ICAP server