------------------------------------------------------------
revno: 11827
revision-id: squidadm@squid-cache.org-20111028001903-mvo8s1ad4ere41ta
parent: rousskov@measurement-factory.com-20111027231428-c3ibb2f8bwa3hx93
committer: Automatic source maintenance <squidadm@squid-cache.org>
branch nick: trunk
timestamp: Thu 2011-10-27 18:19:03 -0600
message:
  SourceFormat Enforcement
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squidadm@squid-cache.org-20111028001903-\
#   mvo8s1ad4ere41ta
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: dd68aaefc76ff5fb1f93169073c77792b4289171
# timestamp: 2011-10-28 00:58:13 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: rousskov@measurement-factory.com-20111027231428-\
#   c3ibb2f8bwa3hx93
# 
# Begin patch
=== modified file 'src/DiskIO/IpcIo/IpcIoFile.cc'
--- src/DiskIO/IpcIo/IpcIoFile.cc	2011-10-27 22:51:19 +0000
+++ src/DiskIO/IpcIo/IpcIoFile.cc	2011-10-28 00:19:03 +0000
@@ -866,7 +866,7 @@
 IpcIoClaimMemoryNeedsRr::run(const RunnerRegistry &)
 {
     const int itemsCount = Ipc::FewToFewBiQueue::MaxItemsCount(
-        ::Config.workers, ::Config.cacheSwap.n_strands, QueueCapacity);
+                               ::Config.workers, ::Config.cacheSwap.n_strands, QueueCapacity);
     // the maximum number of shared I/O pages is approximately the
     // number of queue slots, we add a fudge factor to that to account
     // for corner cases where I/O pages are created before queue

=== modified file 'src/ssl/support.cc'
--- src/ssl/support.cc	2011-10-27 15:27:25 +0000
+++ src/ssl/support.cc	2011-10-28 00:19:03 +0000
@@ -1283,10 +1283,10 @@
 
     if (certificate && chain) {
 
-        if (X509_check_issued(certificate, certificate) == X509_V_OK) 
+        if (X509_check_issued(certificate, certificate) == X509_V_OK)
             debugs(83, 5, "Certificate is self-signed, will not be chained");
         else {
-            if(sk_X509_push(chain, certificate))
+            if (sk_X509_push(chain, certificate))
                 CRYPTO_add(&(certificate->references), 1, CRYPTO_LOCK_X509);
             else
                 debugs(83, DBG_IMPORTANT, "WARNING: unable to add signing certificate to cert chain");
@@ -1297,7 +1297,7 @@
             }
         }
     }
-    
+
     return certificate;
 }