Merge branch 'master' into 6.0.x * master: Revert "TS-1007: SSLN Close called before TXN Close. This closes #249." TS-3806 Resolve undefined reference to symbol MD5_Final
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/2805dd26 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/2805dd26 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/2805dd26 Branch: refs/heads/6.0.x Commit: 2805dd266ac2ab17b97365fd69d3208b03a68a96 Parents: f0e395f 1d1eaa6 Author: Leif Hedstrom <[email protected]> Authored: Fri Jul 31 08:09:27 2015 -0600 Committer: Leif Hedstrom <[email protected]> Committed: Fri Jul 31 08:09:27 2015 -0600 ---------------------------------------------------------------------- cmd/traffic_manager/Makefile.am | 3 ++- iocore/net/UnixNet.cc | 5 +---- proxy/http/HttpClientSession.cc | 8 -------- proxy/http/HttpSM.cc | 30 ++++++++---------------------- proxy/spdy/SpdyClientSession.cc | 8 +++++--- proxy/spdy/SpdyClientSession.h | 7 ++++++- 6 files changed, 22 insertions(+), 39 deletions(-) ----------------------------------------------------------------------
