You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2013/08/06 10:48:47 UTC
[12/12] git commit: Merge branch 'master' into 3.3.x
Merge branch 'master' into 3.3.x
* master:
TS-2100 Initialize the SSL/NPN registration mutex
add TS-1987, TS-2097 to CHANGES
TS-2097: remove ink_strtok_r() wrapper
TS-2097 Remove ink_string_find_dotted_extension()
TS-2097 replace ink_string_copy() w/ ink_strlcpy()
TS-2097: remove unsued string functions
TS-1987: replace ink_string_fast functions
TS-1987: rip out ink_string_fast_ functions
TS-1501: fix the bug that mistaken the read as write of netvc. thanks zwoop for pointing it out.
TS-2091: Fix spacing in separate commit
TS-2091: Return an error from RecGetRecordOrderAndId if the stat isn't registered
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/e413f12c
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/e413f12c
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/e413f12c
Branch: refs/heads/3.3.x
Commit: e413f12ce13ccfd2742d069501a102673e8975f7
Parents: 1bb12ed fe62a34
Author: Leif Hedstrom <zw...@apache.org>
Authored: Tue Aug 6 02:48:22 2013 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Tue Aug 6 02:48:22 2013 -0600
----------------------------------------------------------------------
CHANGES | 8 +-
cop/TrafficCop.cc | 4 +-
iocore/dns/DNS.cc | 4 +-
iocore/net/P_UnixNetVConnection.h | 2 +-
lib/records/RecConfigParse.cc | 6 +-
lib/records/RecCore.cc | 16 +-
lib/ts/ink_string.cc | 39 -----
lib/ts/ink_string.h | 299 ---------------------------------
mgmt/LocalManager.cc | 4 +-
mgmt/api/CfgContextUtils.cc | 2 +-
mgmt/cluster/ClusterCom.cc | 36 ++--
proxy/http/HttpProxyServerMain.cc | 2 +-
proxy/http/HttpTransactCache.cc | 8 +-
proxy/http/remap/UrlRewrite.cc | 38 ++---
proxy/logging/LogBuffer.cc | 3 +-
proxy/logging/LogFilter.cc | 4 +-
16 files changed, 72 insertions(+), 403 deletions(-)
----------------------------------------------------------------------