You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by br...@apache.org on 2015/07/02 09:10:54 UTC
[2/3] trafficserver git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/trafficserver
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/dc2b07ba
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/dc2b07ba
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/dc2b07ba
Branch: refs/heads/master
Commit: dc2b07ba90a610024fcf389eb904738f0d80fc80
Parents: 440a145 7b0a57f
Author: Brian Geffon <br...@apache.org>
Authored: Thu Jul 2 00:08:20 2015 -0700
Committer: Brian Geffon <br...@apache.org>
Committed: Thu Jul 2 00:08:20 2015 -0700
----------------------------------------------------------------------
Makefile.am | 9 +-
.../configuration/records.config.en.rst | 6 ++
iocore/hostdb/I_HostDBProcessor.h | 1 -
iocore/hostdb/P_HostDBProcessor.h | 10 +-
iocore/net/P_SSLConfig.h | 1 +
iocore/net/P_SSLNetVConnection.h | 27 +++++
iocore/net/SSLConfig.cc | 3 +
iocore/net/SSLNetVConnection.cc | 65 +++++++++++-
iocore/net/SSLNextProtocolAccept.cc | 3 +-
iocore/net/UnixNetVConnection.cc | 23 ++++-
mgmt/RecordsConfig.cc | 20 +---
proxy/ProtocolProbeSessionAccept.cc | 33 ++++--
proxy/http/HttpClientSession.cc | 13 +++
proxy/http/HttpSM.cc | 60 ++++++-----
tools/changelog.pl | 102 +++++++++++++++++++
15 files changed, 312 insertions(+), 64 deletions(-)
----------------------------------------------------------------------