trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject [10/26] git commit: Merge branch 'master' into 5.0.x
Date Wed, 05 Feb 2014 00:33:04 GMT
Merge branch 'master' into 5.0.x

Conflicts:
	CHANGES
	proxy/http/HttpSM.cc
	proxy/http/HttpTransactCache.cc
	proxy/http/HttpTransactCache.h


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

Branch: refs/heads/master
Commit: 3433ea6b109d3c36a9e477a10d8a146564c56312
Parents: 6712053 b771f6e
Author: Leif Hedstrom <zwoop@apache.org>
Authored: Wed Nov 13 09:03:59 2013 -0700
Committer: Leif Hedstrom <zwoop@apache.org>
Committed: Wed Nov 13 09:03:59 2013 -0700

----------------------------------------------------------------------
 .gitignore                                      |    5 +-
 CHANGES                                         |   56 +
 Makefile.am                                     |    4 +-
 STATUS                                          |    1 +
 ci/jenkins/jobs.yaml                            |  161 +-
 ci/jenkins/records.config                       |    7 +-
 ci/jenkins/records.config.pristine              |    1 +
 ci/jenkins/remap.config                         |   12 +-
 configure.ac                                    |   14 +-
 cop/Makefile.am                                 |    8 +-
 doc/admin/http-proxy-caching.en.rst             |    8 +
 doc/admin/working-log-files.en.rst              |    2 +
 doc/conf.py                                     |   19 +
 doc/glossary.en.rst                             |   18 +-
 doc/pip_requirements.txt                        |    2 +
 doc/reference/commands/traffic_manager.en.rst   |    1 -
 .../configuration/records.config.en.rst         |  132 +-
 iocore/aio/Makefile.am                          |   11 +-
 iocore/cache/Cache.cc                           |   30 +-
 iocore/cache/CacheHttp.cc                       |   16 +-
 iocore/cache/CacheRead.cc                       |   10 +-
 iocore/cache/CacheWrite.cc                      |    4 +
 iocore/cache/I_CacheDefs.h                      |    2 +-
 iocore/cache/Makefile.am                        |   11 +-
 iocore/cache/P_CacheInternal.h                  |   11 +-
 iocore/cluster/Makefile.am                      |    7 +-
 iocore/dns/DNS.cc                               |    3 +-
 iocore/dns/Makefile.am                          |   11 +-
 iocore/dns/P_DNSProcessor.h                     |   26 +
 iocore/dns/P_SplitDNSProcessor.h                |   27 -
 iocore/eventsystem/Makefile.am                  |   36 +-
 iocore/hostdb/HostDB.cc                         |    2 +-
 iocore/hostdb/Makefile.am                       |   11 +-
 iocore/hostdb/MultiCache.cc                     |    1 +
 iocore/net/Makefile.am                          |   34 +-
 iocore/net/Socks.cc                             |    2 +-
 iocore/utils/Makefile.am                        |    1 -
 lib/atscppapi/examples/Makefile.am              |    4 +-
 .../examples/async_http_fetch/AsyncHttpFetch.cc |    8 +-
 .../examples/clientredirect/ClientRedirect.cc   |    2 +-
 .../examples/clientrequest/ClientRequest.cc     |   21 +-
 .../examples/data_caching/data_caching.cc       |    6 +-
 .../examples/detachedrequest/DetachedRequest.cc |   69 -
 .../examples/detachedrequest/Makefile.am        |   30 -
 .../GzipTransformationPlugin.cc                 |   18 +-
 .../NullTransformationPlugin.cc                 |    2 +-
 .../examples/remap_plugin/RemapPlugin.cc        |    1 +
 .../examples/request_cookies/Makefile.am        |   29 -
 .../examples/request_cookies/RequestCookies.cc  |   67 -
 .../examples/serverresponse/ServerResponse.cc   |   27 +-
 lib/atscppapi/src/AsyncHttpFetch.cc             |    3 +-
 lib/atscppapi/src/Headers.cc                    |  783 +++---
 lib/atscppapi/src/Request.cc                    |    3 +-
 lib/atscppapi/src/Response.cc                   |    4 +-
 lib/atscppapi/src/include/atscppapi/Headers.h   |  636 ++++-
 lib/records/Makefile.am                         |    8 +-
 lib/records/RecMessage.cc                       |    6 +-
 lib/ts/Makefile.am                              |  100 +-
 lib/ts/ink_file.cc                              |   15 +
 lib/ts/ink_file.h                               |    4 +
 lib/tsconfig/BisonHeaderToC++.sed               |    1 +
 lib/tsconfig/Makefile.am                        |   13 +-
 lib/wccp/Makefile.am                            |   10 +-
 mgmt/Main.cc                                    |   17 -
 mgmt/Makefile.am                                |    9 +-
 mgmt/ProxyConfig.cc                             |    2 +-
 mgmt/RecordsConfig.cc                           |    8 +-
 mgmt/api/APITestCliRemote.cc                    | 2458 ++++++++++++++++++
 mgmt/api/CoreAPIRemote.cc                       |  843 ++++++
 mgmt/api/EventRegistration.cc                   |  166 ++
 mgmt/api/EventRegistration.h                    |   49 +
 mgmt/api/Makefile.am                            |   51 +-
 mgmt/api/NetworkUtilsRemote.cc                  | 1772 +++++++++++++
 mgmt/api/NetworkUtilsRemote.h                   |  109 +
 mgmt/api/remote/APITestCliRemote.cc             | 2458 ------------------
 mgmt/api/remote/CoreAPIRemote.cc                |  843 ------
 mgmt/api/remote/EventRegistration.cc            |  166 --
 mgmt/api/remote/EventRegistration.h             |   49 -
 mgmt/api/remote/Makefile.am                     |   59 -
 mgmt/api/remote/NetworkUtilsRemote.cc           | 1772 -------------
 mgmt/api/remote/NetworkUtilsRemote.h            |  109 -
 mgmt/cli/Makefile.am                            |    5 +-
 mgmt/preparse/IPRange.cc                        |  203 --
 mgmt/preparse/IPRange.h                         |   69 -
 mgmt/preparse/Makefile.am                       |    1 -
 mgmt/preparse/SocksParser.cc                    |   24 -
 mgmt/stats/StatProcessor.cc                     |   66 +-
 mgmt/stats/StatProcessor.h                      |    3 +
 mgmt/utils/Makefile.am                          |   10 +-
 mgmt/utils/MgmtSchema.cc                        |  335 ---
 mgmt/utils/MgmtSchema.h                         |   57 -
 mgmt/utils/XmlUtils.cc                          |  663 -----
 mgmt/utils/XmlUtils.h                           |  153 --
 plugins/experimental/esi/esi.cc                 |   16 +-
 .../esi/fetcher/HttpDataFetcherImpl.cc          |    1 +
 plugins/experimental/remap_stats/remap_stats.c  |    2 +-
 plugins/header_rewrite/README                   |   33 +-
 plugins/header_rewrite/condition.cc             |   10 +-
 plugins/header_rewrite/condition.h              |    2 +-
 plugins/header_rewrite/conditions.cc            |  104 +-
 plugins/header_rewrite/conditions.h             |   80 +-
 plugins/header_rewrite/factory.cc               |   18 +-
 plugins/header_rewrite/factory.h                |    2 +-
 plugins/header_rewrite/lulu.h                   |    2 +-
 plugins/header_rewrite/matcher.h                |   29 +-
 plugins/header_rewrite/operator.cc              |    9 +-
 plugins/header_rewrite/operator.h               |  139 +-
 plugins/header_rewrite/operators.cc             |   59 +-
 plugins/header_rewrite/operators.h              |   21 +-
 plugins/header_rewrite/parser.h                 |    2 +-
 plugins/header_rewrite/regex_helper.cc          |   10 +-
 plugins/header_rewrite/regex_helper.h           |    7 +-
 plugins/header_rewrite/resources.cc             |    4 +-
 plugins/header_rewrite/resources.h              |    2 +-
 plugins/header_rewrite/ruleset.cc               |    9 +-
 plugins/header_rewrite/ruleset.h                |   14 +-
 plugins/header_rewrite/statement.cc             |    9 +-
 plugins/header_rewrite/statement.h              |    2 +-
 plugins/header_rewrite/value.h                  |    2 +-
 proxy/DiagsConfig.cc                            |  415 ---
 proxy/DiagsConfig.h                             |   44 -
 proxy/Error.cc                                  |  109 -
 proxy/Error.h                                   |  173 --
 proxy/Initialize.cc                             |   39 +-
 proxy/Initialize.h                              |    2 +-
 proxy/InkAPI.cc                                 |    1 +
 proxy/Main.cc                                   |    4 +-
 proxy/Makefile.am                               |   27 +-
 proxy/PluginVC.cc                               |    9 +
 proxy/ReverseProxy.cc                           |    4 +-
 proxy/UglyLogStubs.cc                           |  210 --
 proxy/congest/Makefile.am                       |    1 +
 proxy/hdrs/Makefile.am                          |   19 +-
 proxy/http/HttpConfig.cc                        |    8 +-
 proxy/http/HttpSM.cc                            |   11 +-
 proxy/http/HttpTransact.cc                      |   13 +-
 proxy/http/HttpTransactCache.cc                 |  121 +-
 proxy/http/Makefile.am                          |   16 +-
 proxy/http/remap/Makefile.am                    |   10 +-
 proxy/http/remap/RemapConfig.cc                 | 1290 +++++++++
 proxy/http/remap/RemapConfig.h                  |   79 +
 proxy/http/remap/RemapPluginInfo.h              |   11 -
 proxy/http/remap/UrlRewrite.cc                  | 1301 +--------
 proxy/http/remap/UrlRewrite.h                   |   36 +-
 proxy/logging/Log.cc                            |    2 +-
 proxy/logging/LogObject.h                       |    6 +-
 proxy/logging/Makefile.am                       |    5 +
 proxy/shared/DiagsConfig.cc                     |  415 +++
 proxy/shared/DiagsConfig.h                      |   44 +
 proxy/shared/Error.cc                           |  109 +
 proxy/shared/Error.h                            |  173 ++
 proxy/shared/Makefile.am                        |   52 +
 proxy/shared/UglyLogStubs.cc                    |  211 ++
 tools/Makefile.am                               |    2 +-
 tools/lighttpd_mod_generator/mod_generator.c    |   20 +
 155 files changed, 10177 insertions(+), 10509 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3433ea6b/CHANGES
----------------------------------------------------------------------
diff --cc CHANGES
index 4bd710f,5e3c759..4877e65
--- a/CHANGES
+++ b/CHANGES
@@@ -1,12 -1,63 +1,68 @@@
                                                           -*- coding: utf-8 -*-
 -Changes with Apache Traffic Server 4.2.0
 +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.2.0
++
+   *) [TS-2340] Fix TextLogObject log rolling.
+    Author: bettydramit <b13621367396@gmail.com>
+ 
+   *) [TS-2343] Remove the --schema option from Traffic Manager, and the code
+    around it.
+ 
+   *) [TS-2316] header_rewrite: numerous improvements: cookie based conditions,
+    rule counters, improved documentation.
+    Author: Alexey Ivanov <aivanov@linkedin.com>
+ 
+   *) [TS-2338] Remove IPRange.cc and .h, and SocksParser.cc.
+ 
+   *) [TS-2333] Change the SAX callbacks to not clash with libxml2, which broke
+    synthetic metric completely.
+ 
+   *) [TS-2339] Cleanup Makefile.am, fixing missing / wrong _SOURCES entries.
+ 
+   *) [TS-2341] Cast TSHttpStatus to int to suppress compiler warning in clang
+ 
+   *) [TS-2303] Incorrect docs for negative_caching_enabled.
+     Author: Thomas Jackson <jacksontj.89@gmail.com>
+ 
+   *) [TS-2082] fix build with --enable-standalone-iocore.
+ 
+   *) [TS-2712] Explicitly use subdir-objects in automake init.
+ 
+   *) [TS-2309] Allow mod_generator plugin for lighttpd to accept "SI" postfixes.
+ 
+ 
  Changes with Apache Traffic Server 4.1.0
  
+   *) [TS-2252] Fix bison version check on Ubuntu.
+ 
+   *) [TS-2108] Fix TSConfig to build with bison 3.0
+ 
+   *) [TS-2311] ESI: Support responses that are of other text content type as well as non-200
status response.
+    Author: Kit Chan
+ 
+   *) [TS-2321] C++ API: Clean up header code to not use STL containers and use structures
directly
+ 
+   *) [TS-2323] Implement a .include directive for remap.config.
+ 
+   *) [TS-2322] Set PCRE malloc hooks globally.
+ 
+   *) [TS-1955] Range: requests during read-while-writer gets the wrong
+   Content-Length.
+ 
+   *) [TS-2245] This adds a '2' config state to the ignore mismatch configs.
+ 
+   *) [TS-2178] Force keep alive off if re-using client 4-tuple and server is
+   not keep alive.
+ 
+   *) [TS-2264] Fixed problem with EADDR_NOTAVAIL handling.
+ 
+   *) [TS-2317] Read/write mutex of PluginVC may be held without release.
+    Author: portl4t.cn@gmail.com
  
    *) [TS-2315] ESI Plugin: fetcher does not handle error gracefully.
     Author: Kit Chan.

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3433ea6b/iocore/cache/Cache.cc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3433ea6b/iocore/cache/CacheRead.cc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3433ea6b/iocore/cache/P_CacheInternal.h
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3433ea6b/proxy/http/HttpSM.cc
----------------------------------------------------------------------
diff --cc proxy/http/HttpSM.cc
index 77e8f2c,e5751a0..906578b
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@@ -405,7 -405,20 +405,6 @@@ HttpSM::init(
    // Simply point to the global config for the time being, no need to copy this
    // entire struct if nothing is going to change it.
    t_state.txn_conf = &t_state.http_config_param->oride;
--
 -  // update the cache info config structure so that
 -  // selection from alternates happens correctly.
 -  t_state.cache_info.config.cache_global_user_agent_header = t_state.http_config_param->global_user_agent_header
? true : false;
 -  t_state.cache_info.config.ignore_accept_mismatch = t_state.http_config_param->ignore_accept_mismatch;
 -  t_state.cache_info.config.ignore_accept_language_mismatch = t_state.http_config_param->ignore_accept_language_mismatch
;
 -  t_state.cache_info.config.ignore_accept_encoding_mismatch = t_state.http_config_param->ignore_accept_encoding_mismatch;
 -  t_state.cache_info.config.ignore_accept_charset_mismatch = t_state.http_config_param->ignore_accept_charset_mismatch;
 -  t_state.cache_info.config.cache_enable_default_vary_headers = t_state.http_config_param->cache_enable_default_vary_headers
? true : false;
 -
 -  t_state.cache_info.config.cache_vary_default_text = t_state.http_config_param->cache_vary_default_text;
 -  t_state.cache_info.config.cache_vary_default_images = t_state.http_config_param->cache_vary_default_images;
 -  t_state.cache_info.config.cache_vary_default_other = t_state.http_config_param->cache_vary_default_other;
 -
    t_state.init();
    t_state.srv_lookup = hostdb_srv_enabled;
  

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3433ea6b/proxy/http/HttpTransactCache.cc
----------------------------------------------------------------------
diff --cc proxy/http/HttpTransactCache.cc
index ada10bc,8699ee8..25058fb
--- a/proxy/http/HttpTransactCache.cc
+++ b/proxy/http/HttpTransactCache.cc
@@@ -290,14 -296,11 +290,11 @@@ HttpTransactCache::SelectFromAlternates
  
  */
  float
- HttpTransactCache::calculate_quality_of_match(HttpConfigParams * http_config_param, HTTPHdr
* client_request,
-                                               HTTPHdr * obj_client_request, HTTPHdr * obj_origin_server_response)
 -HttpTransactCache::calculate_quality_of_match(CacheLookupHttpConfig * http_config_param,
++HttpTransactCache::calculate_quality_of_match(HttpConfigParams * http_config_param,
+                                               HTTPHdr * client_request,
+                                               HTTPHdr * obj_client_request,
+                                               HTTPHdr * obj_origin_server_response)
  {
-   float q[4], Q;
-   MIMEField *accept_field;
-   MIMEField *cached_accept_field;
-   MIMEField *content_field;
- 
    // For PURGE requests, any alternate is good really.
    if (client_request->method_get_wksidx() == HTTP_WKSIDX_PURGE)
      return (float)1.0;


Mime
View raw message