You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2012/03/30 21:12:52 UTC
git commit: TS-1092 Remove overlapping conditional
Updated Branches:
refs/heads/master f5d90c94b -> 6d24b00cf
TS-1092 Remove overlapping conditional
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/6d24b00c
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/6d24b00c
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/6d24b00c
Branch: refs/heads/master
Commit: 6d24b00cf7ce6355917515e63952dd830e77f9a3
Parents: f5d90c9
Author: Leif Hedstrom <le...@ogre.com>
Authored: Fri Mar 30 13:12:38 2012 -0600
Committer: Leif Hedstrom <le...@ogre.com>
Committed: Fri Mar 30 13:12:38 2012 -0600
----------------------------------------------------------------------
proxy/http/HttpProxyServerMain.cc | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6d24b00c/proxy/http/HttpProxyServerMain.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpProxyServerMain.cc b/proxy/http/HttpProxyServerMain.cc
index 803e213..7bf55e1 100644
--- a/proxy/http/HttpProxyServerMain.cc
+++ b/proxy/http/HttpProxyServerMain.cc
@@ -207,19 +207,16 @@ start_HttpProxyServer(int accept_threads)
ha_opt.outbound_ip6 = HttpConfig::m_master.outbound_ip6;
if (HttpProxyPort::TRANSPORT_SSL == p.m_type) {
- if (HttpProxyPort::hasSSL()) {
- HttpAccept * http = NEW(new HttpAccept(ha_opt));
- SSLNextProtocolAccept * ssl = NEW(new SSLNextProtocolAccept(http));
- ssl->registerEndpoint(TS_NPN_PROTOCOL_HTTP_1_0, http);
- ssl->registerEndpoint(TS_NPN_PROTOCOL_HTTP_1_1, http);
+ HttpAccept * http = NEW(new HttpAccept(ha_opt));
+ SSLNextProtocolAccept * ssl = NEW(new SSLNextProtocolAccept(http));
+ ssl->registerEndpoint(TS_NPN_PROTOCOL_HTTP_1_0, http);
+ ssl->registerEndpoint(TS_NPN_PROTOCOL_HTTP_1_1, http);
#ifndef TS_NO_API
- ink_scoped_mutex lock(ssl_plugin_mutex);
- ssl_plugin_acceptors.push(ssl);
+ ink_scoped_mutex lock(ssl_plugin_mutex);
+ ssl_plugin_acceptors.push(ssl);
#endif
-
- sslNetProcessor.main_accept(ssl, p.m_fd, opt);
- }
+ sslNetProcessor.main_accept(ssl, p.m_fd, opt);
} else {
netProcessor.main_accept(NEW(new HttpAccept(ha_opt)), p.m_fd, opt);
}