Updated Branches: refs/heads/master 9883f2cf8 -> 448179c12
TS-1229 Fix collation in custom logging Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/448179c1 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/448179c1 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/448179c1 Branch: refs/heads/master Commit: 448179c127582a590c3ed95a75ffc40f4e377b75 Parents: 9883f2c Author: bettydramit <[email protected]> Authored: Wed Jun 20 17:56:36 2012 +0800 Committer: Zhao Yongming <[email protected]> Committed: Wed Jun 20 17:56:36 2012 +0800 ---------------------------------------------------------------------- CHANGES | 3 +++ proxy/logging/LogHost.cc | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/448179c1/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index ea587ec..d4e01ce 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,8 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 3.3.0 + *) [TS-1229] Fix collation in custom logging. + Author: bettydramit + *) [TS-1306] Fix WCCP build problems on FreeBSD. *) [TS-1303] Added '=6' as special case for HTTP port configuration for http://git-wip-us.apache.org/repos/asf/trafficserver/blob/448179c1/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
