------------------------------------------------------------
revno: 10858
revision-id: squidadm@squid-cache.org-20100913001925-18bxx7sk8w29dcd9
parent: squidadm@squid-cache.org-20100913001657-kn5e6h8w2bx7jjo5
committer: Automatic source maintenance <squidadm@squid-cache.org>
branch nick: trunk
timestamp: Sun 2010-09-12 18:19:25 -0600
message:
  SourceFormat Enforcement
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squidadm@squid-cache.org-20100913001925-\
#   18bxx7sk8w29dcd9
# target_branch: http://www.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: 85636b1d75b43633e7b142f01b8f64fab41f557b
# timestamp: 2010-09-13 00:53:27 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: squidadm@squid-cache.org-20100913001657-\
#   kn5e6h8w2bx7jjo5
# 
# Begin patch
=== modified file 'src/adaptation/icap/OptXact.cc'
--- src/adaptation/icap/OptXact.cc	2010-09-12 21:58:38 +0000
+++ src/adaptation/icap/OptXact.cc	2010-09-13 00:19:25 +0000
@@ -75,7 +75,7 @@
         // we cannot parse it because we do not support any opt-body-types, so
         // we leave readAll false which forces connection closure.
         readAll = !icapReply->header.getByNameListMember("Encapsulated",
-            "opt-body", ',').size();
+                  "opt-body", ',').size();
         debugs(93, 7, HERE << "readAll=" << readAll);
         icap_tio_finish = current_time;
         setOutcome(xoOpt);

=== modified file 'src/adaptation/icap/Xaction.cc'
--- src/adaptation/icap/Xaction.cc	2010-09-12 22:35:35 +0000
+++ src/adaptation/icap/Xaction.cc	2010-09-13 00:19:25 +0000
@@ -368,16 +368,16 @@
         }
     } else {
 
-    al.icap.bytesRead+=io.size;
-
-    updateTimeout();
-
-    debugs(93, 3, HERE << "read " << io.size << " bytes");
-
-    /*
-     * See comments in Adaptation::Icap::Xaction.h about why we use commBuf
-     * here instead of reading directly into readBuf.buf.
-     */
+        al.icap.bytesRead+=io.size;
+
+        updateTimeout();
+
+        debugs(93, 3, HERE << "read " << io.size << " bytes");
+
+        /*
+         * See comments in Adaptation::Icap::Xaction.h about why we use commBuf
+         * here instead of reading directly into readBuf.buf.
+         */
 
         readBuf.append(commBuf, io.size);
         disableRetries(); // because pconn did not fail