TS-1514 Fix collation in custom logging Backport TS-1299. Fucking, finally.
*) Fix collation in custom logging. Trunk patch: 448179c127582a590c3ed95a75ffc40f4e377b75 Jira: https://issues.apache.org/jira/browse/TS-1514 test/review: igalic, zwoop, zym backport: igalic Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/fb6cf1cf Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/fb6cf1cf Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/fb6cf1cf Branch: refs/heads/3.2.x Commit: fb6cf1cf62b847fa2da0c901005d9f8f6d3cf2a8 Parents: e685713 Author: bettydramit <[email protected]> Authored: Wed Jun 20 17:56:36 2012 +0800 Committer: Igor GaliÄ <[email protected]> Committed: Tue Oct 9 21:37:51 2012 +0200 ---------------------------------------------------------------------- CHANGES | 3 +++ STATUS | 10 ---------- proxy/logging/LogHost.cc | 2 +- 3 files changed, 4 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fb6cf1cf/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 4eec466..82f0953 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 3.2.3 + *) [TS-1514] Fix collation in custom logging. + Author: bettydramit + *) [TS-1498] Fix header_filter plugin for ARM. *) [TS-1497] stats codes mess up when disk fail http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fb6cf1cf/STATUS ---------------------------------------------------------------------- diff --git a/STATUS b/STATUS index 3c868e3..97ce02e 100644 --- a/STATUS +++ b/STATUS @@ -41,16 +41,6 @@ A list of all bugs open for the next development release can be found at PATCHES ACCEPTED TO BACKPORT FROM TRUNK: - *) Fix collation in custom logging. - Trunk patch: 448179c127582a590c3ed95a75ffc40f4e377b75 - Jira: https://issues.apache.org/jira/browse/TS-1514 - +1: igalic, zwoop, zym - - Wrong Jira? --jpeach I wonder if this is similar/related - to TS-1289 ? --zwoop - The Jira is TS-1299, my typo. --zym - Now cloned as TS-1514 - *) SSL-crashed every now and then with 3.2.0 + SNI-fixes Trunk: d6d07d8c43c084d5683b45c1efe9ed2bf9ef8635 3.2.x Patch: https://issues.apache.org/jira/secure/attachment/12546611/TS-1484-3.2.x.patch http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fb6cf1cf/proxy/logging/LogHost.cc ---------------------------------------------------------------------- diff --git a/proxy/logging/LogHost.cc b/proxy/logging/LogHost.cc index f844009..9b8db0c 100644 --- a/proxy/logging/LogHost.cc +++ b/proxy/logging/LogHost.cc @@ -157,7 +157,7 @@ LogHost::set_name_or_ipstr(char *name_or_ip) if (name_or_ip && name_or_ip[0] != 0) { ts::ConstBuffer addr, port; - if (ats_ip_parse(ts::ConstBuffer(name_or_ip, strlen(name_or_ip)), &addr, &port)) { + if (ats_ip_parse(ts::ConstBuffer(name_or_ip, strlen(name_or_ip)), &addr, &port)==0) { uint16_t p = port ? atoi(port.data()) : Log::config->collation_port; char* n = const_cast<char*>(addr.data()); // Force termination. We know we can do this because the address
