[prev in list] [next in list] [prev in thread] [next in thread] 

List:       squid-cvs
Subject:    /bzr/squid3/trunk/ r12124: SourceFormat Enforcement
From:       Automatic source maintenance <squidadm () squid-cache ! org>
Date:       2012-04-26 1:04:17
Message-ID: 20120426010513.63804.qmail () squid-cache ! org
[Download RAW message or body]

--===============0361012158==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

------------------------------------------------------------
revno: 12124
committer: Automatic source maintenance <squidadm@squid-cache.org>
branch nick: trunk
timestamp: Wed 2012-04-25 19:04:17 -0600
message:
  SourceFormat Enforcement
modified:
  src/cache_cf.cc
  src/comm/ModPoll.cc
  src/structs.h

--===============0361012158==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"; name="r12124.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

=== modified file 'src/cache_cf.cc'
--- a/src/cache_cf.cc	2012-04-25 05:29:20 +0000
+++ b/src/cache_cf.cc	2012-04-26 01:04:17 +0000
@@ -873,37 +873,37 @@
 
     Config.ssl_client.sslContext = sslCreateClientContext(Config.ssl_client.cert, \
Config.ssl_client.key, Config.ssl_client.version, Config.ssl_client.cipher, \
Config.ssl_client.options, Config.ssl_client.flags, Config.ssl_client.cafile, \
Config.ssl_client.capath, Config.ssl_client.crlfile);  
-        for (peer *p = Config.peers; p != NULL; p = p->next) {
-            if (p->use_ssl) {
-                debugs(3, 1, "Initializing cache_peer " << p->name << " SSL \
                context");
-                p->sslContext = sslCreateClientContext(p->sslcert, p->sslkey, \
p->sslversion, p->sslcipher, p->ssloptions, p->sslflags, p->sslcafile, p->sslcapath, \
                p->sslcrlfile);
-            }
-        }
-
-        for (AnyP::PortCfg *s = Config.Sockaddr.http; s != NULL; s = s->next) {
-            if (!s->cert && !s->key)
-                continue;
-
-            debugs(3, 1, "Initializing http_port " << s->s << " SSL context");
-
-            s->staticSslContext.reset(
-                sslCreateServerContext(s->cert, s->key,
-                                       s->version, s->cipher, s->options, \
                s->sslflags, s->clientca,
-                                       s->cafile, s->capath, s->crlfile, s->dhfile,
-                                       s->sslContextSessionId));
-
-            Ssl::readCertChainAndPrivateKeyFromFiles(s->signingCert, s->signPkey, \
                s->certsToChain, s->cert, s->key);
-        }
-
-        for (AnyP::PortCfg *s = Config.Sockaddr.https; s != NULL; s = s->next) {
-            debugs(3, 1, "Initializing https_port " << s->s << " SSL context");
-
-            s->staticSslContext.reset(
-                sslCreateServerContext(s->cert, s->key,
-                                       s->version, s->cipher, s->options, \
                s->sslflags, s->clientca,
-                                       s->cafile, s->capath, s->crlfile, s->dhfile,
-                                       s->sslContextSessionId));
-        }
+    for (peer *p = Config.peers; p != NULL; p = p->next) {
+        if (p->use_ssl) {
+            debugs(3, 1, "Initializing cache_peer " << p->name << " SSL context");
+            p->sslContext = sslCreateClientContext(p->sslcert, p->sslkey, \
p->sslversion, p->sslcipher, p->ssloptions, p->sslflags, p->sslcafile, p->sslcapath, \
p->sslcrlfile); +        }
+    }
+
+    for (AnyP::PortCfg *s = Config.Sockaddr.http; s != NULL; s = s->next) {
+        if (!s->cert && !s->key)
+            continue;
+
+        debugs(3, 1, "Initializing http_port " << s->s << " SSL context");
+
+        s->staticSslContext.reset(
+            sslCreateServerContext(s->cert, s->key,
+                                   s->version, s->cipher, s->options, s->sslflags, \
s->clientca, +                                   s->cafile, s->capath, s->crlfile, \
s->dhfile, +                                   s->sslContextSessionId));
+
+        Ssl::readCertChainAndPrivateKeyFromFiles(s->signingCert, s->signPkey, \
s->certsToChain, s->cert, s->key); +    }
+
+    for (AnyP::PortCfg *s = Config.Sockaddr.https; s != NULL; s = s->next) {
+        debugs(3, 1, "Initializing https_port " << s->s << " SSL context");
+
+        s->staticSslContext.reset(
+            sslCreateServerContext(s->cert, s->key,
+                                   s->version, s->cipher, s->options, s->sslflags, \
s->clientca, +                                   s->cafile, s->capath, s->crlfile, \
s->dhfile, +                                   s->sslContextSessionId));
+    }
 
 #endif
 

=== modified file 'src/comm/ModPoll.cc'
--- a/src/comm/ModPoll.cc	2012-04-25 05:29:20 +0000
+++ b/src/comm/ModPoll.cc	2012-04-26 01:04:17 +0000
@@ -328,7 +328,7 @@
 
     nevents = comm_check_incoming_poll_handlers(nfds, fds);
     incoming_tcp_interval = incoming_tcp_interval
-                             + Config.comm_incoming.tcp.average - nevents;
+                            + Config.comm_incoming.tcp.average - nevents;
 
     if (incoming_tcp_interval < Config.comm_incoming.tcp.min_poll)
         incoming_tcp_interval = Config.comm_incoming.tcp.min_poll;

=== modified file 'src/structs.h'
--- a/src/structs.h	2012-04-25 05:29:20 +0000
+++ b/src/structs.h	2012-04-26 01:04:17 +0000
@@ -145,7 +145,8 @@
 class RemovalPolicySettings;
 class external_acl;
 class Store;
-namespace AnyP {
+namespace AnyP
+{
 struct PortCfg;
 }
 class SwapDir;


--===============0361012158==--


[prev in list] [next in list] [prev in thread] [next in thread]