GitHub user shinrich opened a pull request:
https://github.com/apache/trafficserver/pull/1153
6.2 backport TS-4507 TS-4813 TS-4892
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/shinrich/trafficserver
6-2-back-ts-4507-ts-4813
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/trafficserver/pull/1153.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #1153
----
commit a0aa1643ad035a50d67d75641ebc62691aac066d
Author: shinrich <shinr...@ieee.org>
Date: 2016-07-15T20:52:09Z
TS-4507: Fix SSN and TXN hook ordering.
(cherry picked from commit 85c021123fd94c4d97a6015484eb1d8054bec9eb)
Conflicts:
proxy/ProxyClientSession.h
proxy/http/HttpSM.cc
proxy/http2/Http2ClientSession.cc
proxy/http2/Http2Stream.cc
commit 59ecec4f64a4a675b10b91d6efd9c67ae18606f0
Author: Susan Hinrichs <shinr...@ieee.org>
Date: 2016-09-26T18:32:20Z
TS-4892: Wrong metric for
proxy.process.http.current_active_client_connections.
(cherry picked from commit 2bbb4ed729e00cf40e07b9ca7868f06217b037da)
Conflicts:
proxy/ProxyClientTransaction.cc
commit 76148a29b915d972ce0ab9490d5c9ff32efc1abe
Author: Susan Hinrichs <shinr...@ieee.org>
Date: 2016-09-27T16:24:11Z
TS-4813: Fix lingering stream.
(cherry picked from commit dc8be341578aa0fa900c84265d0a336414dfad9b)
Conflicts:
iocore/net/SSLNetVConnection.cc
proxy/http2/Http2ConnectionState.cc
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
