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 2015/08/04 18:04:39 UTC
[4/4] trafficserver git commit: Merge branch 'master' into 6.0.x
Merge branch 'master' into 6.0.x
* master:
TS-3817: Assertion on non (HTTP/S WS/S) request scheme in debug mode
TS-3776: traffic_server failed assert s->current.server->had_connect_fail()
TS-3801: Add error handling when stream is CLOSED
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/252eb213
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/252eb213
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/252eb213
Branch: refs/heads/6.0.x
Commit: 252eb213165e1e1064619ef990ed96de9751212f
Parents: 6062188 d308606
Author: Leif Hedstrom <zw...@apache.org>
Authored: Tue Aug 4 10:03:25 2015 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Tue Aug 4 10:03:25 2015 -0600
----------------------------------------------------------------------
proxy/http/HttpTransact.cc | 5 +--
proxy/http2/Http2ConnectionState.cc | 52 +++++++++++++++++++++++---------
proxy/http2/Http2ConnectionState.h | 10 ++++++
3 files changed, 51 insertions(+), 16 deletions(-)
----------------------------------------------------------------------