reverse my stupid change this may prevent some strange crashing.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/207ac9a6 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/207ac9a6 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/207ac9a6 Branch: refs/heads/sphinx-docs Commit: 207ac9a66149af5551814b4964a22bc16cdf3461 Parents: a8981a7 Author: Zhao Yongming <[email protected]> Authored: Sat Apr 27 00:38:25 2013 +0800 Committer: Zhao Yongming <[email protected]> Committed: Sat Apr 27 00:38:35 2013 +0800 ---------------------------------------------------------------------- proxy/logging/LogAccess.cc | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/207ac9a6/proxy/logging/LogAccess.cc ---------------------------------------------------------------------- diff --git a/proxy/logging/LogAccess.cc b/proxy/logging/LogAccess.cc index 3f60bf6..df1e1b5 100644 --- a/proxy/logging/LogAccess.cc +++ b/proxy/logging/LogAccess.cc @@ -380,14 +380,15 @@ LogAccess::marshal_proxy_host_name(char *buf) if (machine) { str = machine->hostname; - len = LogAccess::strlen(str); + } - if (buf) { - marshal_str(buf, str, len); - return len; - } + len = LogAccess::strlen(str); + + if (buf) { + marshal_str(buf, str, len); } - return 0; + + return len; } /*-------------------------------------------------------------------------
