Updated Branches: refs/heads/master 448179c12 -> 425a9ee8d
TS-1310 To avoid endless loop on handleReadDone. Thanks Hua Cai ([email protected]) Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/425a9ee8 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/425a9ee8 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/425a9ee8 Branch: refs/heads/master Commit: 425a9ee8df3dbfa1554eccaaf601c933ad18c201 Parents: 448179c Author: weijin <[email protected]> Authored: Wed Jun 20 18:31:59 2012 +0800 Committer: weijin <[email protected]> Committed: Wed Jun 20 18:41:42 2012 +0800 ---------------------------------------------------------------------- CHANGES | 3 +++ iocore/cache/Cache.cc | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/425a9ee8/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index d4e01ce..e248ef2 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,8 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 3.3.0 + *) [TS-1310] Fix a endless loop in CacheVC::removeEvent. + Author: weijin & Hua Cai + *) [TS-1229] Fix collation in custom logging. Author: bettydramit http://git-wip-us.apache.org/repos/asf/trafficserver/blob/425a9ee8/iocore/cache/Cache.cc ---------------------------------------------------------------------- diff --git a/iocore/cache/Cache.cc b/iocore/cache/Cache.cc index 864918a..f8d7a07 100644 --- a/iocore/cache/Cache.cc +++ b/iocore/cache/Cache.cc @@ -2086,6 +2086,7 @@ CacheVC::removeEvent(int event, Event *e) f.remove_aborted_writers = 1; } Lread: + SET_HANDLER(&CacheVC::removeEvent); if (!buf) goto Lcollision; if (!dir_valid(vol, &dir)) {
