From: Automatic source maintenance Date: Mon, 13 Sep 2010 00:16:57 +0000 (-0600) Subject: Bootstrapped X-Git-Tag: take1~266 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e6f9e2639d89de20d33044e91109d9198cbea046;p=thirdparty%2Fsquid.git Bootstrapped --- diff --git a/src/BodyPipe.cc b/src/BodyPipe.cc index 78bed77587..31922952b1 100644 --- a/src/BodyPipe.cc +++ b/src/BodyPipe.cc @@ -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; } } diff --git a/src/adaptation/icap/ModXact.cc b/src/adaptation/icap/ModXact.cc index 2bdb1820f0..f08abdf328 100644 --- a/src/adaptation/icap/ModXact.cc +++ b/src/adaptation/icap/ModXact.cc @@ -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(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(oldHead)) { - newHead = new HttpReply; - } - Must(newHead != NULL); + HttpMsg::Pointer newHead; + if (const HttpRequest *oldR = dynamic_cast(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(oldHead)) { + newHead = new HttpReply; + } + Must(newHead != NULL); - newHead->inheritProperties(oldHead); + newHead->inheritProperties(oldHead); - adapted.setHeader(newHead); + adapted.setHeader(newHead); } // parse the buffer back