------------------------------------------------------------
revno: 11230
revision-id: squidadm@squid-cache.org-20110216011234-rr964t77278m10kf
parent: squid3@treenet.co.nz-20110216004511-rcukpjfahimkfzv9
committer: Automatic source maintenance <squidadm@squid-cache.org>
branch nick: trunk
timestamp: Tue 2011-02-15 18:12:34 -0700
message:
  SourceFormat Enforcement
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squidadm@squid-cache.org-20110216011234-\
#   rr964t77278m10kf
# target_branch: http://www.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: 7452465258c0b1684aa65218adbca760aaff0612
# timestamp: 2011-02-16 01:54:56 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: squid3@treenet.co.nz-20110216004511-\
#   rcukpjfahimkfzv9
# 
# Begin patch
=== modified file 'src/auth/basic/auth_basic.cc'
--- src/auth/basic/auth_basic.cc	2011-02-15 12:55:35 +0000
+++ src/auth/basic/auth_basic.cc	2011-02-16 01:12:34 +0000
@@ -337,7 +337,7 @@
         if (strcspn(cleartext, "\r\n") != strlen(cleartext)) {
             debugs(29, DBG_IMPORTANT, "WARNING: Bad characters in authorization header '" << httpAuthHeader << "'");
             safe_free(cleartext);
-       }
+        }
     }
     return cleartext;
 }

=== modified file 'src/external_acl.cc'
--- src/external_acl.cc	2011-02-15 15:18:38 +0000
+++ src/external_acl.cc	2011-02-16 01:12:34 +0000
@@ -1439,8 +1439,8 @@
         debugs(82, 4, "externalAclLookup: using cached entry " << entry);
 
         if (entry != NULL) {
-            debugs(82, 4, "externalAclLookup: entry = { date=" << 
-               (long unsigned int) entry->date <<
+            debugs(82, 4, "externalAclLookup: entry = { date=" <<
+                   (long unsigned int) entry->date <<
                    ", result=" << entry->result <<
                    " tag=" << entry->tag <<
                    " log=" << entry->log << " }");