trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject [50/50] git commit: Merge branch 'master' into 5.0.x
Date Fri, 30 Aug 2013 16:21:03 GMT
Merge branch 'master' into 5.0.x

* master: (53 commits)
  Moved the two 4.0.1 changes that we respun build for.
  Added TS-2163
  TS-2163 Remove obsolete WDA and ACC alarms feature
  ci: move jenkins jobs to the jenkins subdirectory
  ci: toggle --enable-wccp correctly for different platforms
  Doc: Add lifecycle hook documentation.
  TS-2145: Add metrics for log collation
  fixed some spelling mistakes in the api header
  TS-2162: Auto-created collation LogObject would be misused by access log
  Some indentation and printf cleanup
  TS-2161: TSHttpTxnHookAdd memory Leak
  TS-2156: Fix stats trap in different type of threads
  doc: move cache glossary into the main glossary
  TS-2160: Update CHANGES.
  TS-2160: Remove ats_is_ip_nonroutable.
  TS-2160: Remove use of ats_is_ip_nonroutable and replace with ats_is_ip_linklocal and ats_is_ip_private.
  TS-2160: Add ats_is_ip_private and ats_is_ip_linklocal functions.
  TS-2154: Lua plugin asserts traffic_server on startup
  ci: make git scm polling less aggresive
  ci: flip the 3.4.x branch to 4.0.x
  ...


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

Branch: refs/heads/5.0.x
Commit: a75ebb6372c7e64c415d6fb29d8d24038ee79525
Parents: 812b668 68892bc
Author: Leif Hedstrom <zwoop@apache.org>
Authored: Fri Aug 30 09:19:42 2013 -0700
Committer: Leif Hedstrom <zwoop@apache.org>
Committed: Fri Aug 30 09:19:42 2013 -0700

----------------------------------------------------------------------
 CHANGES                                         |  44 +-
 Makefile.am                                     |   2 +-
 STATUS                                          |  24 +-
 build/tcl.m4                                    |   2 +-
 build/xml.m4                                    |   2 +-
 ci/Makefile                                     |  21 -
 ci/apache-rat-0.11-SNAPSHOT.jar                 | Bin 0 -> 1414641 bytes
 ci/coverity-model.cc                            |  18 +
 ci/jenkins.yaml                                 | 486 -----------------
 ci/jenkins/Makefile                             |  21 +
 ci/jenkins/jobs.yaml                            | 524 +++++++++++++++++++
 ci/jenkins/records.config                       |   1 +
 ci/rat-regex.txt                                |  39 ++
 configure.ac                                    |   5 +-
 doc/admin/event-logging-formats.en.rst          | 121 +++--
 doc/admin/faqs.en.rst                           |  69 ++-
 doc/admin/getting-started.en.rst                |  31 +-
 doc/admin/traffic-server-error-messages.en.rst  | 406 +++++++-------
 doc/admin/transparent-proxy/bridge.en.rst       | 111 ++--
 doc/admin/working-log-files.en.rst              | 342 ++++++------
 doc/admin/working-log-files/log-formats.en.rst  |  31 +-
 doc/arch/cache/cache-api.en.rst                 |  17 +
 doc/arch/cache/cache-appendix.en.rst            |  17 +
 doc/arch/cache/cache-glossary.en.rst            |  22 -
 doc/arch/cache/cache.en.rst                     |   2 -
 doc/arch/cache/common.defs                      |  17 +
 doc/arch/cache/tier-storage.en.rst              |  17 +
 doc/conf.py                                     |   4 +-
 doc/ext/traffic-server.py                       |  20 +-
 doc/glossary.en.rst                             |  55 ++
 doc/index.rst                                   |  27 +-
 doc/reference/api/TSHttpHookAdd.en.rst          |  49 +-
 doc/reference/api/TSHttpTxnMilestoneGet.en.rst  | 102 ++--
 doc/reference/api/TSLifecycleHookAdd.en.rst     | 103 ++++
 doc/reference/api/TSPluginInit.en.rst           |   6 +-
 doc/reference/api/TSTypes.en.rst                |  63 +++
 doc/reference/api/index.en.rst                  |  32 +-
 .../configuration/logs_xml.config.en.rst        | 102 ++--
 .../configuration/records.config.en.rst         |  24 +-
 iocore/cache/Notes                              |  18 +
 iocore/dns/P_DNSConnection.h                    |  19 -
 iocore/eventsystem/I_EventProcessor.h           |   2 +-
 iocore/eventsystem/P_UnixEventProcessor.h       |   2 +-
 iocore/eventsystem/UnixEventProcessor.cc        |   6 +-
 iocore/net/P_Connection.h                       |  22 -
 iocore/utils/Machine.cc                         |  10 +-
 lib/perl/lib/Apache/TS/AdminClient.pm           |   1 +
 lib/records/I_RecSignals.h                      |   3 -
 lib/records/RecProcess.cc                       |  33 ++
 lib/ts/Allocator.h                              |   6 +-
 lib/ts/EventNotify.cc                           |  39 +-
 lib/ts/EventNotify.h                            |  13 +-
 lib/ts/ink_inet.cc                              |  10 +-
 lib/ts/ink_inet.h                               |  53 +-
 mgmt/Alarms.cc                                  |  40 +-
 mgmt/Alarms.h                                   |   2 +-
 mgmt/BaseManager.h                              |   3 -
 mgmt/LocalManager.cc                            |   4 -
 mgmt/RecordsConfig.cc                           |   6 +-
 mgmt/cli/ConfigCmd.cc                           |   9 +-
 mgmt/cli/ConfigCmd.h                            |   3 +-
 mgmt/cli/ShowCmd.cc                             |   9 +-
 mgmt/cli/cli_detailed_command_list.txt          |   6 +-
 mgmt/stats/spec                                 |  18 +
 plugins/experimental/Makefile.am                |   1 +
 plugins/experimental/buffer_upload/Makefile.am  |  21 +
 .../experimental/buffer_upload/buffer_upload.cc |  58 +-
 plugins/experimental/lua/state.cc               |   5 +
 plugins/experimental/rfc5861/rfc5861.c          |   1 +
 proxy/InkAPI.cc                                 |   7 +-
 proxy/InkAPIInternal.h                          |   2 +-
 proxy/Main.cc                                   |   4 -
 proxy/Main.h                                    |   1 -
 proxy/StatSystem.h                              |   8 +
 proxy/api/ts/experimental.h                     |   2 +-
 proxy/api/ts/ts.h.in                            |  16 +-
 proxy/config/records.config.default.in          |   1 +
 proxy/example_alarm_bin.sh                      |  50 +-
 proxy/http/HttpConfig.cc                        |   8 +-
 proxy/http/HttpConfig.h                         |   9 +-
 proxy/http/HttpDebugNames.cc                    |   4 +-
 proxy/http/HttpSM.cc                            | 119 +++--
 proxy/http/HttpSM.h                             |   2 +-
 proxy/http/HttpTransact.cc                      |  37 +-
 proxy/http/HttpTransact.h                       |  24 +-
 proxy/http/HttpUpdateSM.cc                      |   2 +-
 proxy/logging/Log.cc                            |  88 +++-
 proxy/logging/Log.h                             |   9 +-
 proxy/logging/LogAccess.cc                      |   4 +-
 proxy/logging/LogCollationClientSM.cc           |   6 +
 proxy/logging/LogCollationHostSM.cc             |  11 +-
 proxy/logging/LogConfig.cc                      | 299 ++++++-----
 proxy/logging/LogConfig.h                       |  59 +--
 proxy/logging/LogFile.cc                        |  33 +-
 proxy/logging/LogObject.cc                      |  67 ++-
 proxy/logging/LogObject.h                       |  13 +-
 proxy/msgs/TSMessages.mc                        |  83 ---
 proxy/msgs/TSMsgs.rc                            |  39 --
 tools/jtest/jtest.cc                            |   1 -
 tools/lighttpd_mod_generator/Makefile           |  20 +
 .../conf/lighttpd_11.conf                       |  17 +
 .../conf/lighttpd_13.conf                       |  17 +
 .../conf/lighttpd_15.conf                       |  17 +
 .../conf/lighttpd_17.conf                       |  17 +
 .../conf/lighttpd_19.conf                       |  17 +
 .../conf/lighttpd_20.conf                       |  17 +
 .../conf/lighttpd_22.conf                       |  17 +
 .../conf/lighttpd_24.conf                       |  17 +
 .../lighttpd_mod_generator/conf/lighttpd_3.conf |  17 +
 .../lighttpd_mod_generator/conf/lighttpd_5.conf |  16 +
 .../lighttpd_mod_generator/conf/lighttpd_7.conf |  16 +
 .../lighttpd_mod_generator/conf/lighttpd_9.conf |  16 +
 112 files changed, 2760 insertions(+), 1871 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a75ebb63/CHANGES
----------------------------------------------------------------------
diff --cc CHANGES
index 06e0960,1db2fe6..920a2c4
--- a/CHANGES
+++ b/CHANGES
@@@ -1,15 -1,42 +1,48 @@@
                                                           -*- coding: utf-8 -*-
 +Changes with Apache Traffic Server 5.0.0
 +
 +  *) [TS-1919] Eliminate CacheLookupHttpConfig. This breaks cluster
 +   compatibility, so all cluster nodes should be upgraded simultaneously.
 +
 +
  Changes with Apache Traffic Server 4.1.0
  
-   *) TS-2141: Inconsistent euid cause bad mgmtapi/eventapi sockets.
+   *) [TS-2163] Remove WDA_BILLING, ACC_ALARMS etc. code and definitions.
  
-   *) TS-2137: Use eventfd instread of pthread signal/wait in ATS.
+   *) [TS-2156] Fix stats trap in different type of threads
+ 
+   *) [TS-2160] Remove ats_is_ip_nonroutable and replace it with the less confusing
+    ats_is_ip_linklocal and ats_is_ip_private.
+ 
+   *) [TS-2158] Properly mark an IP as non-routable for IPv4 and IPv6 link local
+    addresses as well as IPv6 private addresses and IPv4 Carrier Grade NAT
+    addresses from RFC 6598.
+ 
+   *) [TS-2155] Make a new RAT exclude file that uses the regular expressions
+    now supported. Also cleanup some of minor licensing discrepancies.
+ 
+   *) [TS-2148] handle_cache_operation_on_forward_server_response ignores value
+     of api_server_response_no_store.
+     Author: Corey Cossentino <corey@cossentino.com> 
+ 
+   *) [TS-2147] Set server_share_sessions to 1 for 'internal' transactions in
+    rfc5861 plugin.
+ 
+   *) [TS-2107] split proxy.config.http.transaction_active_timeout_in to
+      proxy.config.http.transaction_header_timeout_in and
+      proxy.config.http.transaction_request_timeout_in. 
+ 
+   *) [TS-2114] buffer_upload plugin defines true and false
+     Author: Kit Chan <chanshukit@gmail.com>
+ 
+   *) [TS-2116] buffer_upload plugin is in the source tree but does not build
+     Author: Kit Chan <chanshukit@gmail.com>
+ 
+   *) [TS-2094] eliminate xcrun warnings at configure time
+ 
+   *) [TS-2141] Inconsistent euid cause bad mgmtapi/eventapi sockets.
+ 
+   *) [TS-2137] Use eventfd instread of pthread signal/wait in ATS.
  
    *) [TS-287] Fix transaction_active_timeout_in does not trigger on the first
     request of a Keep-Alive connection. Author: Li Gang <quehan@taobao.com>.

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

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


Mime
View raw message