------------------------------------------------------------
revno: 11687
revision-id: squidadm@squid-cache.org-20121017064741-hw94e92m11tqqnoa
parent: squid3@treenet.co.nz-20121017010252-1xcrxm4nmyic69lc
committer: Automatic source maintenance <squidadm@squid-cache.org>
branch nick: SQUID_3_2
timestamp: Wed 2012-10-17 00:47:41 -0600
message:
  SourceFormat Enforcement
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squidadm@squid-cache.org-20121017064741-\
#   hw94e92m11tqqnoa
# target_branch: http://bzr.squid-cache.org/bzr/squid3/branches\
#   /SQUID_3_2
# testament_sha1: f89657bd654ee8494af2a0f7cd72d62c504dc1a0
# timestamp: 2012-10-17 06:52:13 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/branches\
#   /SQUID_3_2
# base_revision_id: squid3@treenet.co.nz-20121017010252-\
#   1xcrxm4nmyic69lc
# 
# Begin patch
=== modified file 'src/client_side_request.cc'
--- src/client_side_request.cc	2012-10-17 00:43:57 +0000
+++ src/client_side_request.cc	2012-10-17 06:47:41 +0000
@@ -1034,7 +1034,7 @@
             if (request->cache_control->noCache())
                 no_cache=true;
 
-        // RFC 2616: treat Pragma:no-cache as if it was Cache-Control:no-cache when Cache-Control is missing
+            // RFC 2616: treat Pragma:no-cache as if it was Cache-Control:no-cache when Cache-Control is missing
         } else if (req_hdr->has(HDR_PRAGMA))
             no_cache = req_hdr->hasListMember(HDR_PRAGMA,"no-cache",',');
 

=== modified file 'src/ipc/Queue.cc'
--- src/ipc/Queue.cc	2012-10-17 00:02:26 +0000
+++ src/ipc/Queue.cc	2012-10-17 06:47:41 +0000
@@ -49,7 +49,7 @@
 /* QueueReaders */
 
 Ipc::QueueReaders::QueueReaders(const int aCapacity): theCapacity(aCapacity),
-    theReaders(theCapacity)
+        theReaders(theCapacity)
 {
     Must(theCapacity > 0);
 }

=== modified file 'src/ipc/mem/FlexibleArray.h'
--- src/ipc/mem/FlexibleArray.h	2012-10-17 00:02:26 +0000
+++ src/ipc/mem/FlexibleArray.h	2012-10-17 06:47:41 +0000
@@ -5,7 +5,7 @@
 #define SQUID_IPC_MEM_FLEXIBLE_ARRAY_H
 
 // sometimes required for placement-new operator to be declared
-#include <new> 
+#include <new>
 
 namespace Ipc
 {