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 2013/08/06 10:48:46 UTC
[11/12] git commit: TS-2100 Initialize the SSL/NPN registration mutex
TS-2100 Initialize the SSL/NPN registration mutex
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/fe62a344
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/fe62a344
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/fe62a344
Branch: refs/heads/3.3.x
Commit: fe62a344a1962c96ba17dde09d887052a5bd4eac
Parents: 267640b
Author: Leif Hedstrom <zw...@apache.org>
Authored: Tue Aug 6 02:13:44 2013 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Tue Aug 6 02:13:44 2013 -0600
----------------------------------------------------------------------
CHANGES | 4 +++-
proxy/http/HttpProxyServerMain.cc | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fe62a344/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 242bff9..4fe41e3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 3.3.5
-
+
+ *) [TS-2100] Initialize the SSL/NPN registration mutex.
+
* [TS-1987, TS-2097]: Remove duplicate and unused string functions
*) [TS-2091] Return an error from RecGetRecordOrderAndId if the stat isn't
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fe62a344/proxy/http/HttpProxyServerMain.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpProxyServerMain.cc b/proxy/http/HttpProxyServerMain.cc
index 1ee1d6e..cae18bd 100644
--- a/proxy/http/HttpProxyServerMain.cc
+++ b/proxy/http/HttpProxyServerMain.cc
@@ -40,7 +40,7 @@ HttpAccept *plugin_http_accept = NULL;
HttpAccept *plugin_http_transparent_accept = 0;
static SLL<SSLNextProtocolAccept> ssl_plugin_acceptors;
-static ProcessMutex ssl_plugin_mutex;
+static ProcessMutex ssl_plugin_mutex = PTHREAD_MUTEX_INITIALIZER;
bool
ssl_register_protocol(const char * protocol, Continuation * contp)