]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Bootstrapped
authorAutomatic source maintenance <squidadm@squid-cache.org>
Mon, 13 Sep 2010 00:16:57 +0000 (18:16 -0600)
committerAutomatic source maintenance <squidadm@squid-cache.org>
Mon, 13 Sep 2010 00:16:57 +0000 (18:16 -0600)
src/BodyPipe.cc
src/adaptation/icap/ModXact.cc

index 78bed77587b76c4a6b606476d82685cd736b124d..31922952b166efd2d868cd4fe283ca4e8917ea25 100644 (file)
@@ -270,12 +270,12 @@ BodyPipe::expectNoConsumption()
 {
     Must(!theConsumer);
     if (!abortedConsumption && !exhausted()) {
-            AsyncCall::Pointer call= asyncCall(91, 7,
-                                               "BodyProducer::noteBodyConsumerAborted",
-                                               BodyProducerDialer(theProducer,
-                                                                  &BodyProducer::noteBodyConsumerAborted, this));
-            ScheduleCallHere(call);
-            abortedConsumption = true;
+        AsyncCall::Pointer call= asyncCall(91, 7,
+                                           "BodyProducer::noteBodyConsumerAborted",
+                                           BodyProducerDialer(theProducer,
+                                                              &BodyProducer::noteBodyConsumerAborted, this));
+        ScheduleCallHere(call);
+        abortedConsumption = true;
     }
 }
 
index 2bdb1820f04a4655d52abb683cda616c061e4cb5..f08abdf32812d56983dddcd2283032acf23fd956 100644 (file)
@@ -874,20 +874,20 @@ void Adaptation::Icap::ModXact::prepEchoing()
     // allocate the adapted message and copy metainfo
     Must(!adapted.header);
     {
-    HttpMsg::Pointer newHead;
-    if (const HttpRequest *oldR = dynamic_cast<const HttpRequest*>(oldHead)) {
-        HttpRequest::Pointer newR(new HttpRequest);
-        newR->canonical = oldR->canonical ?
-                          xstrdup(oldR->canonical) : NULL; // parse() does not set it
-        newHead = newR;
-    } else if (dynamic_cast<const HttpReply*>(oldHead)) {
-        newHead = new HttpReply;
-    }
-    Must(newHead != NULL);
+        HttpMsg::Pointer newHead;
+        if (const HttpRequest *oldR = dynamic_cast<const HttpRequest*>(oldHead)) {
+            HttpRequest::Pointer newR(new HttpRequest);
+            newR->canonical = oldR->canonical ?
+                              xstrdup(oldR->canonical) : NULL; // parse() does not set it
+            newHead = newR;
+        } else if (dynamic_cast<const HttpReply*>(oldHead)) {
+            newHead = new HttpReply;
+        }
+        Must(newHead != NULL);
 
-    newHead->inheritProperties(oldHead);
+        newHead->inheritProperties(oldHead);
 
-    adapted.setHeader(newHead);
+        adapted.setHeader(newHead);
     }
 
     // parse the buffer back