trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject [3/8] git commit: Merge branch 'master' into ts-995
Date Wed, 22 Feb 2012 16:16:11 GMT
Merge branch 'master' into ts-995

Conflicts:
	iocore/net/SSLNetVConnection.cc
	lib/ts/ink_inet.h
	proxy/logging/LogAccess.cc


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/f1e4bbbb
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/f1e4bbbb
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/f1e4bbbb

Branch: refs/heads/master
Commit: f1e4bbbbe7abca1ce8a90d3692eb6c59563ad656
Parents: 8bfb683 ea97994
Author: Alan M. Carroll <amc@network-geographics.com>
Authored: Tue Feb 21 13:13:37 2012 -0600
Committer: Alan M. Carroll <amc@network-geographics.com>
Committed: Tue Feb 21 13:13:37 2012 -0600

----------------------------------------------------------------------
 CHANGES                              |    2 +
 configure.ac                         |   35 ++-
 iocore/cache/CacheHosting.cc         |    4 +-
 iocore/net/Makefile.am               |    6 +-
 iocore/net/P_SSLCertLookup.h         |   13 +-
 iocore/net/P_SSLNetProcessor.h       |   18 +-
 iocore/net/P_SSLNetVConnection.h     |   92 +----
 iocore/net/P_SSLNextProtocolAccept.h |   61 ++++
 iocore/net/P_SSLNextProtocolSet.h    |   68 ++++
 iocore/net/P_UDPConnection.h         |    5 +-
 iocore/net/P_UDPPacket.h             |    1 -
 iocore/net/SSLCertLookup.cc          |   26 +-
 iocore/net/SSLNet.cc                 |  476 ---------------------------
 iocore/net/SSLNetAccept.cc           |   86 +++++
 iocore/net/SSLNetProcessor.cc        |  506 +++++++++++++++++++++++++++++
 iocore/net/SSLNetVConnection.cc      |  143 ++++-----
 iocore/net/SSLNextProtocolAccept.cc  |  118 +++++++
 iocore/net/SSLNextProtocolSet.cc     |  182 +++++++++++
 iocore/net/SSLUnixNet.cc             |  157 ---------
 iocore/net/UnixNetVConnection.cc     |    2 +-
 lib/ts/Allocator.h                   |    4 +-
 lib/ts/IpMap.cc                      |  105 +++---
 lib/ts/List.h                        |   10 +-
 lib/ts/ink_atomic.h                  |    2 +-
 lib/ts/ink_auth_api.cc               |    2 +-
 lib/ts/ink_inet.h                    |    2 +-
 lib/ts/ink_mutex.h                   |   14 +
 proxy/ControlMatcher.cc              |    4 +-
 proxy/InkAPI.cc                      |   29 ++-
 proxy/InkAPITest.cc                  |    5 +-
 proxy/Main.cc                        |   17 +-
 proxy/Makefile.am                    |    8 +-
 proxy/UglyLogStubs.cc                |   76 ++----
 proxy/api/ts/ts.h.in                 |   33 ++-
 proxy/http/HttpAccept.h              |    2 +-
 proxy/http/HttpProxyServerMain.cc    |   50 +++-
 proxy/logging/LogAccess.cc           |    2 +-
 37 files changed, 1402 insertions(+), 964 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f1e4bbbb/iocore/net/P_UDPConnection.h
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f1e4bbbb/iocore/net/P_UDPPacket.h
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f1e4bbbb/lib/ts/IpMap.cc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f1e4bbbb/lib/ts/ink_inet.h
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f1e4bbbb/proxy/ControlMatcher.cc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f1e4bbbb/proxy/InkAPI.cc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f1e4bbbb/proxy/InkAPITest.cc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f1e4bbbb/proxy/Main.cc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f1e4bbbb/proxy/http/HttpAccept.h
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f1e4bbbb/proxy/logging/LogAccess.cc
----------------------------------------------------------------------
diff --cc proxy/logging/LogAccess.cc
index 64aec91,018e2e8..816d756
--- a/proxy/logging/LogAccess.cc
+++ b/proxy/logging/LogAccess.cc
@@@ -1175,10 -1175,10 +1175,10 @@@ LogAccess::unmarshal_ip(char **buf, IpE
  int
  LogAccess::unmarshal_ip_to_str(char **buf, char *dest, int len)
  {
 -  ts_ip_endpoint ip;
 +  IpEndpoint ip;
  
    unmarshal_ip(buf, &ip);
-   return ats_ip_ntop(&ip, dest, len) ? ::strlen(dest) : -1;
+   return ink_inet_ntop(&ip, dest, len) ? static_cast<int>(::strlen(dest)) : -1;
  }
  
  /*-------------------------------------------------------------------------


Mime
View raw message