Updated Branches: refs/heads/master 461d09912 -> 3fe745442
TS-2396: UrlRewrite.cc free the node of queue not correctly Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/3fe74544 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/3fe74544 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/3fe74544 Branch: refs/heads/master Commit: 3fe745442c6cf2ca53a1d684c6e52889381f4f4c Parents: 461d099 Author: Yu Qing <zhuangy...@taobao.com> Authored: Tue Nov 26 10:40:11 2013 +0800 Committer: James Peach <jpe...@apache.org> Committed: Tue Nov 26 09:45:02 2013 -0800 ---------------------------------------------------------------------- CHANGES | 3 +++ proxy/http/remap/UrlRewrite.cc | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe74544/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 065ef86..c572039 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,9 @@ Changes with Apache Traffic Server 4.2.0 + *) [TS-2396] UrlRewrite.cc does not free the queue correctly. + Author: Yu Qing <zhuangy...@taobao.com> + *) [TS-2382] Partial fix for make install creating man files as root. *) [TS-2381] Reorganize TSUrlCreate docs into separate files. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fe74544/proxy/http/remap/UrlRewrite.cc ---------------------------------------------------------------------- diff --git a/proxy/http/remap/UrlRewrite.cc b/proxy/http/remap/UrlRewrite.cc index 4f8849f..e2d15ee 100644 --- a/proxy/http/remap/UrlRewrite.cc +++ b/proxy/http/remap/UrlRewrite.cc @@ -960,7 +960,8 @@ UrlRewrite::_regexMappingLookup(RegexMappingList ®ex_mappings, URL *request_u void UrlRewrite::_destroyList(RegexMappingList &mappings) { - forl_LL(RegexMapping, list_iter, mappings) { + RegexMapping *list_iter; + while ((list_iter=mappings.pop()) != NULL) { delete list_iter->url_map; if (list_iter->re) { pcre_free(list_iter->re);
