Merge branch 'master' into 6.0.x * master: [TS-3802]: fix double free of MIOBuffer in SSLNetVConnection during SPDY inactivity. TS-3800: HostDB UI: support json output, improve srv records, add hostnames
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/975c4c8c Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/975c4c8c Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/975c4c8c Branch: refs/heads/6.0.x Commit: 975c4c8ca3213d0b550f39092d0a751193ed8a05 Parents: f86beac ec74792 Author: Leif Hedstrom <[email protected]> Authored: Tue Jul 28 17:38:55 2015 -0600 Committer: Leif Hedstrom <[email protected]> Committed: Tue Jul 28 17:38:55 2015 -0600 ---------------------------------------------------------------------- iocore/hostdb/HostDB.cc | 169 ++++++++++++++++++++++++++------- iocore/hostdb/I_HostDBProcessor.h | 3 + proxy/Show.h | 16 +++- proxy/spdy/SpdyClientSession.cc | 8 ++ 4 files changed, 161 insertions(+), 35 deletions(-) ----------------------------------------------------------------------
