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 2014/01/27 21:41:58 UTC

[28/28] git commit: Merge branch 'master' into 5.0.x

Merge branch 'master' into 5.0.x

* master: (25 commits)


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

Branch: refs/heads/5.0.x
Commit: a8cba7c78b15175f4bc31d17d23216564e7fb758
Parents: 2dc0454 77e2776
Author: Leif Hedstrom <zw...@apache.org>
Authored: Mon Jan 27 13:41:10 2014 -0700
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Mon Jan 27 13:41:10 2014 -0700

----------------------------------------------------------------------
 CHANGES                                         |  20 +
 Makefile.am                                     |   2 +-
 build/ax_check_openssl.m4                       | 128 ++++++
 build/crypto.m4                                 | 101 +----
 cmd/traffic_cop/Makefile.am                     |   2 +-
 cmd/traffic_line/Makefile.am                    |   2 +-
 cmd/traffic_line/traffic_line.cc                |   5 +
 cmd/traffic_shell/Makefile.am                   |   2 +-
 cmd/traffic_shell/ShowCmd.cc                    |   2 +-
 configure.ac                                    |   3 -
 doc/admin/configuring-traffic-server.en.rst     |  26 +-
 doc/arch/hacking/index.en.rst                   |  26 ++
 doc/arch/index.en.rst                           |   9 +-
 doc/reference/commands/traffic_line.en.rst      |  13 +-
 .../configuration/records.config.en.rst         |  30 +-
 iocore/aio/AIO.cc                               |   8 +-
 iocore/cache/Cache.cc                           | 153 ++++---
 iocore/cache/CacheTest.cc                       |  72 +++
 iocore/cache/I_Cache.h                          |  22 +
 iocore/cache/P_CacheDisk.h                      |   2 +-
 iocore/dns/DNS.cc                               |  14 +-
 iocore/hostdb/HostDB.cc                         |  12 +-
 iocore/net/Makefile.am                          |   2 +-
 iocore/net/Net.cc                               |  28 +-
 lib/records/I_RecCore.h                         |  19 +-
 lib/records/I_RecDefs.h                         |  25 ++
 lib/records/I_RecEvents.h                       |   3 +
 lib/records/I_RecProcess.h                      |   4 +-
 lib/records/P_RecCore.cc                        |  46 +-
 lib/records/P_RecCore.h                         |   3 -
 lib/records/RecCore.cc                          |  62 ++-
 lib/records/RecHttp.cc                          |  10 +-
 lib/records/RecProcess.cc                       |   2 +-
 lib/records/test_RecProcess.i                   |  12 +-
 lib/records/test_RecordsConfig.cc               |  10 +-
 lib/ts/Makefile.am                              |   2 +-
 lib/ts/ink_args.cc                              |   9 +-
 lib/ts/ink_args.h                               |   2 +-
 lib/ts/ink_file.cc                              |  11 +-
 mgmt/BaseManager.h                              |   9 +-
 mgmt/LocalManager.cc                            |  39 +-
 mgmt/Makefile.am                                |   2 +-
 mgmt/ProcessManager.cc                          |   5 +-
 mgmt/api/CoreAPI.cc                             |  14 +
 mgmt/api/CoreAPI.h                              |   1 +
 mgmt/api/CoreAPIRemote.cc                       |  12 +
 mgmt/api/INKMgmtAPI.cc                          |   6 +
 mgmt/api/Makefile.am                            |   2 +-
 mgmt/api/NetworkUtilsDefs.h                     |   1 +
 mgmt/api/TSControlMain.cc                       |  34 ++
 mgmt/api/TSControlMain.h                        |   1 +
 mgmt/api/include/mgmtapi.h                      |   6 +
 proxy/ICPStats.cc                               |  52 +--
 proxy/InkAPI.cc                                 |  12 +-
 proxy/Main.cc                                   |  39 +-
 proxy/Makefile.am                               |   8 +-
 proxy/Plugin.cc                                 |  34 +-
 proxy/SocksProxy.cc                             |   4 +-
 proxy/http/HttpConfig.cc                        | 440 +++++++++----------
 proxy/http/HttpSM.cc                            |   4 +-
 proxy/http/HttpTransact.cc                      |   3 +-
 proxy/http/remap/RemapConfig.cc                 |  85 ++--
 proxy/http/remap/UrlMapping.cc                  |   7 +-
 proxy/logging/Log.cc                            |  83 ++--
 proxy/logging/Log.h                             |   4 +-
 proxy/logging/LogConfig.cc                      |   4 +-
 proxy/logging/LogStandalone.cc                  |  19 +-
 tools/Makefile.am                               |   2 +-
 68 files changed, 1127 insertions(+), 709 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a8cba7c7/CHANGES
----------------------------------------------------------------------
diff --cc CHANGES
index 4fe8ff6,d2cce2d..8a00765
--- a/CHANGES
+++ b/CHANGES
@@@ -1,10 -1,26 +1,30 @@@
                                                           -*- coding: utf-8 -*-
 +Changes with Apache Traffic Server 5.0.0
 +
 +  *) [TS-2088] Change TSRecordType enum values to powers of two
 +
  Changes with Apache Traffic Server 4.2.0
  
+   *) [TS-2519] Make build version metrics non-persistent.
+ 
+   *) [TS-1606] Log buffers are not flushed periodically when TS is launched 
+    with NO_REMOTE_MANAGEMENT flag
+ 
+   *) [TS-2481] Incorrect origin server port used sometimes (with keep-alive).
+    Author: Dimitry Andric <di...@andric.com>
+ 
+   *) [TS-2526] Remove the g_stats_snap_fpath global variable.
+ 
+   *) [TS-2525] Remove restrictions on outbound transparency with SSL.
+ 
+   *) [TS-2425] Update to TS-2261 for loading plugins as root
+ 
+   *) [TS-2505] Add traffic_line --offline option.
+ 
+   *) [TS-2305] Fall back to ftruncate if posix_fallocate fails.
+ 
+   *) [TS-2504] Support OpenSSL installations that use the lib64 directory.
+ 
    *) [TS-799] Have AdminClient.pm created from .in file.
  
    *) [TS-2509] Add the const qualifier to pure HttpTunnel member functions.

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a8cba7c7/lib/records/I_RecDefs.h
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a8cba7c7/lib/records/RecCore.cc
----------------------------------------------------------------------