← Back to branch summary

~ubuntu-branches/ubuntu/wily/trafficserver/wily

« back to all changes in this revision

Viewing changes to proxy/logging/LogHost.cc

  • Committer: Package Import Robot
  • Author(s): Adam Conrad
  • Date: 2013-04-29 11:47:57 UTC
  • mfrom: (5.2.1 sid)
  • Revision ID: package-import@ubuntu.com-20130429114757-bbeb5eacidfuj2qg
Tags: 3.2.4-1ubuntu1
* Merge from Debian unstable.  Remaining changes:
  - Revert FreeBSD strerror_r() fixes that give errors with glibc 2.16.
* Drop markos's ARM barrier definition patch, now integrated upstream.
* Brute-force upstream's suboptimal C/C++ with: -Wno-unused-result
  -Wno-sizeof-pointer-memaccess -Wno-unused-local-typedefs flags.

Show diffs side-by-side

added added

removed removed

Lines of Context:
proxy/logging/LogHost.cc
157
157
 
158
158
  if (name_or_ip && name_or_ip[0] != 0) {
159
159
    ts::ConstBuffer addr, port;
160
 
    if (ats_ip_parse(ts::ConstBuffer(name_or_ip, strlen(name_or_ip)), &addr, &port)) {
 
160
    if (ats_ip_parse(ts::ConstBuffer(name_or_ip, strlen(name_or_ip)), &addr, &port)==0) {
161
161
      uint16_t p = port ? atoi(port.data()) : Log::config->collation_port;
162
162
      char* n = const_cast<char*>(addr.data());
163
163
      // Force termination. We know we can do this because the address