You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by bc...@apache.org on 2012/05/05 01:18:30 UTC

[1/4] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver

Updated Branches:
  refs/heads/master d5beeb60c -> a2fd13c83


Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver


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

Branch: refs/heads/master
Commit: a2fd13c83e7c2b892484dd47ab14a6610a86f34b
Parents: c50f37d d5beeb6
Author: Bryan Call <br...@yahoo.com>
Authored: Fri May 4 16:18:21 2012 -0700
Committer: Bryan Call <br...@yahoo.com>
Committed: Fri May 4 16:18:21 2012 -0700

----------------------------------------------------------------------
 CHANGES                                 |   15 +
 configure.ac                            |   46 +
 example/add-header/Makefile.am          |    2 +-
 example/app-template/Makefile.am        |    3 -
 example/append-transform/Makefile.am    |    2 +-
 example/basic-auth/Makefile.am          |    2 +-
 example/blacklist-0/Makefile.am         |    2 +-
 example/blacklist-1/Makefile.am         |    2 +-
 example/bnull-transform/Makefile.am     |    2 +-
 example/cache_scan/Makefile.am          |    2 +-
 example/file-1/Makefile.am              |    2 +-
 example/hello/Makefile.am               |    2 +-
 example/null-transform/Makefile.am      |    2 +-
 example/output-header/Makefile.am       |    2 +-
 example/prefetch/Makefile.am            |    2 +-
 example/protocol/Makefile.am            |    2 +-
 example/query_remap/Makefile.am         |    2 +-
 example/redirect-1/Makefile.am          |    2 +-
 example/remap/Makefile.am               |    2 +-
 example/replace-header/Makefile.am      |    2 +-
 example/response-header-1/Makefile.am   |    2 +-
 example/server-transform/Makefile.am    |    2 +-
 example/session-1/Makefile.am           |    2 +-
 example/thread-1/Makefile.am            |    2 +-
 example/thread-pool/Makefile.am         |    2 +-
 example/thread-pool/include/Makefile.am |    2 -
 iocore/cluster/ClusterHandlerBase.cc    |    5 +
 iocore/cluster/ClusterProcessor.cc      |    4 +
 iocore/net/Connection.cc                |    1 +
 iocore/net/I_NetProcessor.h             |    3 +
 iocore/net/I_NetVConnection.h           |    9 +-
 iocore/net/P_Connection.h               |    3 +
 iocore/net/P_NetAccept.h                |    2 +
 iocore/net/P_UnixNetVConnection.h       |    9 +-
 iocore/net/UnixConnection.cc            |   42 +-
 iocore/net/UnixNetAccept.cc             |   20 +-
 iocore/net/UnixNetProcessor.cc          |    4 +
 iocore/net/UnixNetVConnection.cc        |    6 +
 lib/ts/Makefile.am                      |    2 -
 lib/ts/ink_config.h.in                  |    2 +
 lib/ts/ink_isolatin_table.cc            |  579 ----
 lib/ts/ink_isolatin_table.h             |   51 -
 lib/ts/libts.h                          |    1 -
 mgmt/RecordsConfig.cc                   |   14 +-
 plugins/conf_remap/Makefile.am          |    3 +-
 plugins/header_filter/Makefile.am       |    2 +-
 plugins/regex_remap/Makefile.am         |    2 +-
 plugins/stats_over_http/Makefile.am     |    2 +-
 proxy/InkAPI.cc                         |  117 +
 proxy/InkAPITest.cc                     |    4 +-
 proxy/Plugin.cc                         |    7 -
 proxy/PluginVC.cc                       |    6 +
 proxy/PluginVC.h                        |    1 +
 proxy/UglyLogStubs.cc                   |    2 +
 proxy/api/ts/ts.h.in                    |   51 +-
 proxy/http/HttpConfig.cc                |    6 +
 proxy/http/HttpConfig.h                 |    3 +
 proxy/http/HttpProxyServerMain.cc       |    2 +
 proxy/http/HttpSM.cc                    |  112 +-
 proxy/http/HttpSM.h                     |    2 +
 proxy/http/HttpTransact.cc              |    4 +-
 proxy/http/HttpTransact.h               |   12 +-
 proxy/logging/Log.cc                    |   24 +
 proxy/logging/LogAccess.cc              |   43 +
 proxy/logging/LogAccess.h               |    9 +
 proxy/logging/LogAccessHttp.cc          |   80 +-
 proxy/logging/LogAccessHttp.h           |    9 +
 proxy/logging/LogConfig.cc              |   24 +
 proxy/logging/LogField.cc               |    8 +
 proxy/logging/LogField.h                |    2 +
 tools/jtest/Makefile                    |    3 +-
 tools/jtest/jtest.cc                    | 3802 ++++++++++++--------------
 72 files changed, 2452 insertions(+), 2757 deletions(-)
----------------------------------------------------------------------