You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2014/09/25 18:14:35 UTC
git commit: Strip unnecessary whitespace
Repository: trafficserver
Updated Branches:
refs/heads/master 2ee3bcf2c -> fc81a028a
Strip unnecessary whitespace
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/fc81a028
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/fc81a028
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/fc81a028
Branch: refs/heads/master
Commit: fc81a028afe1123cf37561852618d56f2c110123
Parents: 2ee3bcf
Author: James Peach <jp...@apache.org>
Authored: Thu Sep 25 09:14:16 2014 -0700
Committer: James Peach <jp...@apache.org>
Committed: Thu Sep 25 09:14:30 2014 -0700
----------------------------------------------------------------------
iocore/net/SSLUtils.cc | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fc81a028/iocore/net/SSLUtils.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLUtils.cc b/iocore/net/SSLUtils.cc
index 5a4ef96..a807e2b 100644
--- a/iocore/net/SSLUtils.cc
+++ b/iocore/net/SSLUtils.cc
@@ -195,7 +195,7 @@ ssl_servername_callback(SSL * ssl, int * ad, void * /*arg*/)
Debug("ssl", "ssl_servername_callback ssl=%p ad=%d server=%s handshake_complete=%d", ssl, *ad, servername,
netvc->getSSLHandShakeComplete());
-
+
if (servername != NULL) {
strncpy(netvc->sniServername, servername, TS_MAX_HOST_NAME_LEN);
}
@@ -218,7 +218,7 @@ ssl_servername_callback(SSL * ssl, int * ad, void * /*arg*/)
netvc->attributes = HttpProxyPort::TRANSPORT_BLIND_TUNNEL;
netvc->setSSLHandShakeComplete(true);
retval = SSL_TLSEXT_ERR_READ_AGAIN;
-#else
+#else
Error("Must have openssl patch to support OPT_TUNNEL from SNI callback");
retval = SSL_TLSEXT_ERR_ALERT_FATAL;
#endif
@@ -253,12 +253,12 @@ ssl_servername_callback(SSL * ssl, int * ad, void * /*arg*/)
// Call the plugin SNI code
reenabled = netvc->callHooks(TS_SSL_SNI_HOOK);
- // If it did not re-enable, return the code to
+ // If it did not re-enable, return the code to
// stop the accept processing
if (!reenabled){
#ifdef SSL_TLSEXT_ERR_READ_AGAIN
retval = SSL_TLSEXT_ERR_READ_AGAIN;
-#else
+#else
Error("Must have openssl patch to support OPT_TUNNEL from SNI callback");
retval = SSL_TLSEXT_ERR_ALERT_FATAL;
#endif
@@ -695,7 +695,6 @@ SSLInitializeStatistics()
RECD_INT, RECP_PERSISTENT, (int) ssl_total_tickets_renewed_stat,
RecRawStatSyncCount);
-
/* error stats */
RecRegisterRawStat(ssl_rsb, RECT_PROCESS, "proxy.process.ssl.ssl_error_want_write",
RECD_INT, RECP_PERSISTENT, (int) ssl_error_want_write,
@@ -722,7 +721,6 @@ SSLInitializeStatistics()
RECD_INT, RECP_PERSISTENT, (int) ssl_sni_name_set_failure,
RecRawStatSyncCount);
-
// Get and register the SSL cipher stats. Note that we are using the default SSL context to obtain
// the cipher list. This means that the set of ciphers is fixed by the build configuration and not
// filtered by proxy.config.ssl.server.cipher_suite. This keeps the set of cipher suites stable across
@@ -1661,7 +1659,6 @@ SSLReleaseContext(SSL_CTX * ctx)
SSL_CTX_free(ctx);
}
-
ssl_error_t
SSLWriteBuffer(SSL * ssl, const void * buf, int64_t nbytes, int64_t& nwritten)
{