------------------------------------------------------------ revno: 12368 revision-id: squidadm@squid-cache.org-20121017025909-9agu2odpl0je9891 parent: squid3@treenet.co.nz-20121016234645-37pwcizrkazozrjh committer: Automatic source maintenance branch nick: 3.3 timestamp: Tue 2012-10-16 20:59:09 -0600 message: SourceFormat Enforcement ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squidadm@squid-cache.org-20121017025909-\ # 9agu2odpl0je9891 # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # testament_sha1: 2fe9dfa1f19e191a4e32953e9d73eb83bf5773b0 # timestamp: 2012-10-17 03:53:19 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # base_revision_id: squid3@treenet.co.nz-20121016234645-\ # 37pwcizrkazozrjh # # Begin patch === modified file 'src/client_side_request.cc' --- src/client_side_request.cc 2012-10-16 23:46:45 +0000 +++ src/client_side_request.cc 2012-10-17 02:59:09 +0000 @@ -1050,7 +1050,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-16 23:46:07 +0000 +++ src/ipc/Queue.cc 2012-10-17 02:59:09 +0000 @@ -46,7 +46,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-16 23:46:07 +0000 +++ src/ipc/mem/FlexibleArray.h 2012-10-17 02:59:09 +0000 @@ -5,7 +5,7 @@ #define SQUID_IPC_MEM_FLEXIBLE_ARRAY_H // sometimes required for placement-new operator to be declared -#include +#include namespace Ipc {