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/89aaa498 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/89aaa498 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/89aaa498 Branch: refs/heads/master Commit: 89aaa498b8326623c8d979f84a9311c324a3cda6 Parents: 9b3adb7 59aca28 Author: Brian Geffon <[email protected]> Authored: Fri May 30 13:51:41 2014 -0700 Committer: Brian Geffon <[email protected]> Committed: Fri May 30 13:51:41 2014 -0700 ---------------------------------------------------------------------- CHANGES | 2 ++ .../collapsed_connection.cc | 25 ++++++++++---------- 2 files changed, 15 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/89aaa498/CHANGES ---------------------------------------------------------------------- diff --cc CHANGES index 757978f,1a7817b..6b46da2 --- a/CHANGES +++ b/CHANGES @@@ -1,9 -1,8 +1,11 @@@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 5.0.0 + + *) [TS-1981] Url remap and IPAllow method filtering is broken with non-wks method + and add support for arbitrary methods + *) [TS-2865] Fix warnings in collapsed connection plugin + *) [TS-2580] SSL Connection reset by peer errors in 4.2.0-rc0 *) [TS-2783] Update documentation defaults, and fix RecordsConfig.cc.
