[2/2] trafficserver git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver
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/4282d335 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/4282d335 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/4282d335 Branch: refs/heads/master Commit: 4282d335366d716fd0ee860e40446f7e49052d0f Parents: 00cb698 46156a8 Author: shinrich Authored: Mon Jul 6 18:34:24 2015 -0500 Committer: shinrich Committed: Mon Jul 6 18:34:24 2015 -0500 -- tools/slow_log_report.pl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --
[2/2] trafficserver git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver
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/6c2c3128 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/6c2c3128 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/6c2c3128 Branch: refs/heads/master Commit: 6c2c31285cff51a405d2f3533780460b62fa06d5 Parents: 4933bad bcec70d Author: Brian Geffon Authored: Thu Jul 16 19:20:59 2015 -0700 Committer: Brian Geffon Committed: Thu Jul 16 19:20:59 2015 -0700 -- build/plugins.mk| 1 - ci/jenkins/bin/in_tree.sh | 3 +- ci/jenkins/bin/out_of_tree.sh | 6 +- cmd/traffic_cop/Makefile.am | 2 - cmd/traffic_cop/traffic_cop.cc | 14 ++- cmd/traffic_crashlog/Makefile.am| 2 - cmd/traffic_crashlog/traffic_crashlog.cc| 9 +- cmd/traffic_crashlog/traffic_crashlog.h | 5 +- cmd/traffic_ctl/Makefile.am | 2 - cmd/traffic_ctl/traffic_ctl.h | 9 +- cmd/traffic_layout/Makefile.am | 2 - cmd/traffic_layout/traffic_layout.cc| 9 +- cmd/traffic_line/Makefile.am| 2 - cmd/traffic_line/traffic_line.cc| 12 +- cmd/traffic_manager/AddConfigFilesHere.cc | 4 +- cmd/traffic_manager/Makefile.am | 5 +- cmd/traffic_manager/MgmtHandlers.cc | 5 +- cmd/traffic_manager/StatProcessor.cc| 3 +- cmd/traffic_manager/StatProcessor.h | 4 +- cmd/traffic_manager/StatType.cc | 6 +- cmd/traffic_manager/StatXML.cc | 2 +- cmd/traffic_manager/StatXML.h | 2 +- cmd/traffic_manager/WebOverview.cc | 6 +- cmd/traffic_manager/WebOverview.h | 8 +- cmd/traffic_manager/traffic_manager.cc | 12 +- cmd/traffic_top/Makefile.am | 2 - cmd/traffic_top/traffic_top.cc | 2 +- cmd/traffic_via/Makefile.am | 2 - cmd/traffic_via/traffic_via.cc | 13 +-- cmd/traffic_wccp/Makefile.am| 1 - cmd/traffic_wccp/wccp_client.cc | 4 +- example/session-1/session-1.c | 2 +- example/version/version.c | 3 +- iocore/aio/I_AIO.h | 2 +- iocore/aio/Makefile.am | 4 +- iocore/aio/test_AIO.cc | 2 +- iocore/cache/Cache.cc | 4 +- iocore/cache/CacheDir.cc| 4 +- iocore/cache/CacheHosting.cc| 4 +- iocore/cache/CacheHttp.cc | 2 +- iocore/cache/I_Cache.h | 2 +- iocore/cache/I_CacheDefs.h | 2 + iocore/cache/I_Store.h | 2 +- iocore/cache/Makefile.am| 2 - iocore/cache/P_Cache.h | 4 +- iocore/cache/P_CacheInternal.h | 3 +- iocore/cache/RamCacheCLFUS.cc | 1 + iocore/cache/Store.cc | 7 +- iocore/cluster/ClusterMachine.cc| 5 +- iocore/cluster/Makefile.am | 2 - iocore/cluster/P_Cluster.h | 2 +- iocore/dns/Makefile.am | 2 - iocore/dns/P_DNS.h | 2 +- iocore/dns/P_DNSProcessor.h | 1 - iocore/dns/SRV.h| 2 +- iocore/dns/SplitDNS.cc | 7 +- iocore/eventsystem/IOBuffer.cc | 2 +- iocore/eventsystem/I_Action.h | 2 +- iocore/eventsystem/I_Continuation.h | 3 +- iocore/eventsystem/I_EThread.h | 4 +- iocore/eventsystem/I_Event.h| 2 +- iocore/eventsystem/I_EventProcessor.h | 2 +- iocore/eventsystem/I_EventSystem.h | 2 +- iocore/eventsystem/I_IOBuffer.h | 8 +- iocore/eventsystem/I_Lock.h | 3 +- iocore/eventsystem/I_PriorityEventQueue.h | 2 +- iocore/eventsystem/I_Processor.h| 2 +- iocore/eventsystem/I_ProtectedQueue.h | 2 +- iocore/eventsystem/I_ProxyAllocator.h | 2 +- iocore/eventsystem/I_SocketManager.h| 2 +- iocore/eventsystem/I_Thread.h | 3 +- iocore/eventsystem/I_VConnection.h | 2 +- iocore/eventsystem/I_VIO.h | 4 +- iocore/eventsystem/Lock.cc | 2 +- iocore/eventsystem/Makefile.am
[2/2] trafficserver git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver
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/d3a7f1b2 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/d3a7f1b2 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/d3a7f1b2 Branch: refs/heads/master Commit: d3a7f1b2f847feee3c17f1eaaa91df50ffef5e25 Parents: 08b5af2 392d3ab Author: Brian Geffon Authored: Thu Jul 23 00:02:43 2015 -0700 Committer: Brian Geffon Committed: Thu Jul 23 00:02:43 2015 -0700 -- proxy/hdrs/HdrHeap.cc | 2 +- proxy/hdrs/MIME.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --
[2/2] trafficserver git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver
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/80601500 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/80601500 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/80601500 Branch: refs/heads/master Commit: 80601500269726c4c25488ea2bf8d830298f27cf Parents: a54b47c bd76377 Author: shinrich Authored: Mon Oct 5 12:45:45 2015 -0500 Committer: shinrich Committed: Mon Oct 5 12:45:45 2015 -0500 -- doc/reference/configuration/records.config.en.rst | 3 +-- doc/reference/plugins/header_rewrite.en.rst | 11 +-- 2 files changed, 6 insertions(+), 8 deletions(-) --
[2/2] trafficserver git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver
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/98916289 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/98916289 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/98916289 Branch: refs/heads/master Commit: 989162895c710db33e1ab70bfcc53016e61f0ac3 Parents: 8cc7137 b71a24e Author: Sudheer Vinukonda Authored: Tue Nov 11 19:17:01 2014 + Committer: Sudheer Vinukonda Committed: Tue Nov 11 19:17:01 2014 + -- CHANGES | 2 + iocore/eventsystem/EventSystem.cc | 3 +- iocore/eventsystem/I_ProxyAllocator.h | 35 - iocore/eventsystem/ProxyAllocator.cc | 29 ++ lib/ts/Allocator.h| 34 lib/ts/ink_queue.cc | 62 ++ lib/ts/ink_queue.h| 1 + 7 files changed, 148 insertions(+), 18 deletions(-) --
[2/2] trafficserver git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver
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/f7d8f1b5 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/f7d8f1b5 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/f7d8f1b5 Branch: refs/heads/master Commit: f7d8f1b546bd256e802c690ee3592b1bfd323334 Parents: f19eba3 be70f1c Author: Sudheer Vinukonda Authored: Mon Nov 17 21:26:54 2014 + Committer: Sudheer Vinukonda Committed: Mon Nov 17 21:26:54 2014 + -- ci/rat-regex.txt | 1 + 1 file changed, 1 insertion(+) --
[2/2] trafficserver git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver
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/326d4f8c Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/326d4f8c Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/326d4f8c Branch: refs/heads/master Commit: 326d4f8ce26471f90105e8d37e1f9fb76d354042 Parents: b13d2e4 c53eb2e Author: Sudheer Vinukonda Authored: Tue Jan 27 22:23:58 2015 + Committer: Sudheer Vinukonda Committed: Tue Jan 27 22:23:58 2015 + -- doc/reference/configuration/records.config.en.rst | 4 ++-- iocore/net/UnixNet.cc | 4 ++-- proxy/hdrs/HdrTest.cc | 12 +--- 3 files changed, 9 insertions(+), 11 deletions(-) --
[2/2] trafficserver git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver
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/ce74235e Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/ce74235e Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/ce74235e Branch: refs/heads/master Commit: ce74235e3c2b8c7ac88bc9c3c6c19ce359885f68 Parents: 1c1a72a 2dbdd9c Author: Brian Geffon Authored: Mon Feb 9 16:22:14 2015 -0800 Committer: Brian Geffon Committed: Mon Feb 9 16:22:14 2015 -0800 -- CHANGES | 7 ++ build/crypto.m4 | 83 +++- ci/new_tsqa/tests/helpers.py| 2 +- cmd/traffic_cop/Makefile.am | 9 ++- cmd/traffic_crashlog/Makefile.am| 9 +-- cmd/traffic_layout/Makefile.am | 5 ++ cmd/traffic_line/Makefile.am| 8 ++- cmd/traffic_manager/Makefile.am | 10 +-- cmd/traffic_top/Makefile.am | 11 +++- cmd/traffic_via/Makefile.am | 6 +- cmd/traffic_wccp/Makefile.am| 17 +++-- configure.ac| 18 +++-- doc/admin/event-logging-formats.en.rst | 22 +++ iocore/aio/Makefile.am | 15 +++-- iocore/cache/Cache.cc | 2 +- iocore/cache/CacheDir.cc| 2 +- iocore/eventsystem/Makefile.am | 28 iocore/net/Makefile.am | 15 +++-- iocore/net/P_SSLConfig.h| 4 +- iocore/net/SSLConfig.cc | 10 ++- iocore/net/SSLInternal.cc | 7 ++ iocore/net/SSLNetProcessor.cc | 2 +- iocore/net/SSLUtils.cc | 4 +- lib/ts/ink_config.h.in | 2 + mgmt/Makefile.am| 6 +- mgmt/utils/Makefile.am | 12 ++-- mgmt/web2/WebUtils.cc | 2 +- plugins/experimental/esi/lib/FailureInfo.cc | 1 + proxy/Main.cc | 68 ++- proxy/Makefile.am | 44 + proxy/Plugin.cc | 26 +--- proxy/Plugin.h | 2 +- proxy/ReverseProxy.cc | 6 +- proxy/ReverseProxy.h| 2 +- proxy/http/HttpProxyServerMain.cc | 10 +-- 35 files changed, 357 insertions(+), 120 deletions(-) --
[2/2] trafficserver git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver
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/06412678 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/06412678 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/06412678 Branch: refs/heads/master Commit: 064126785da054daf35e08f85c308b3028321db7 Parents: 5fb742d 87efe79 Author: shinrich Authored: Mon Feb 9 21:56:51 2015 -0600 Committer: shinrich Committed: Mon Feb 9 21:56:51 2015 -0600 -- example/Makefile.am | 2 + example/remap_header_add/build.txt | 17 +++ example/remap_header_add/remap_header_add.cc | 178 ++ iocore/dns/SplitDNS.cc | 2 +- lib/ts/MatcherUtils.h| 9 +- proxy/CacheControl.cc| 2 +- proxy/ControlMatcher.cc | 10 +- proxy/ParentSelection.cc | 2 +- proxy/congest/Congestion.cc | 2 +- 9 files changed, 213 insertions(+), 11 deletions(-) --
[2/2] trafficserver git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver
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/0a51ce2f Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/0a51ce2f Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/0a51ce2f Branch: refs/heads/master Commit: 0a51ce2f65a36249b486e5ad592ba9a9211467d5 Parents: 88c5531 505593d Author: shinrich Authored: Tue Apr 28 14:24:10 2015 -0500 Committer: shinrich Committed: Tue Apr 28 14:24:10 2015 -0500 -- CHANGES | 3 +++ plugins/experimental/background_fetch/background_fetch.cc | 2 +- plugins/experimental/cache_promote/cache_promote.cc | 3 +-- 3 files changed, 5 insertions(+), 3 deletions(-) --
[2/2] trafficserver git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver
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/cc40b928 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/cc40b928 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/cc40b928 Branch: refs/heads/master Commit: cc40b928bf9d3645f3620bafe233fe289ae60a0e Parents: 03d091f 110b99a Author: Brian Geffon Authored: Sun May 17 22:24:50 2015 -0700 Committer: Brian Geffon Committed: Sun May 17 22:24:50 2015 -0700 -- CHANGES | 46 +- ci/rat-regex.txt|2 + ci/tsqa/Makefile| 29 +- ci/tsqa/README.rst |2 + ci/tsqa/tests/helpers.py|3 +- ci/tsqa/tests/test_hostdb.py|5 + cmd/traffic_top/traffic_top.cc |2 +- doc/reference/plugins/cache_promote.en.rst |2 +- doc/reference/plugins/header_rewrite.en.rst | 22 +- iocore/cache/Cache.cc |2 +- iocore/net/Makefile.am |3 + iocore/net/OCSPStapling.cc | 11 +- iocore/net/P_NetAccept.h|4 +- iocore/net/P_OCSPStapling.h |2 +- iocore/net/P_SSLClientUtils.h | 39 + iocore/net/P_SSLNetAccept.h |2 +- iocore/net/P_SSLUtils.h |6 +- iocore/net/SSLClientUtils.cc| 186 ++ iocore/net/SSLConfig.cc |4 +- iocore/net/SSLNetAccept.cc |4 +- iocore/net/SSLNetProcessor.cc |2 +- iocore/net/SSLNetVConnection.cc |4 + iocore/net/SSLUtils.cc | 214 +- iocore/net/UnixNetAccept.cc | 14 +- iocore/net/UnixNetProcessor.cc |6 +- lib/ts/Makefile.am | 10 +- lib/ts/X509HostnameValidator.cc | 270 +++ lib/ts/X509HostnameValidator.h | 39 + lib/ts/apidefs.h.in | 2124 +- lib/ts/libts.h |1 + lib/ts/test_X509HostnameValidator.cc| 183 ++ plugins/cacheurl/cacheurl.cc|9 +- plugins/experimental/ats_pagespeed/Makefile |8 +- plugins/experimental/ats_pagespeed/README.md| 15 +- .../experimental/ats_pagespeed/ats_pagespeed.cc | 174 +- .../experimental/ats_pagespeed/ats_pagespeed.h | 18 +- .../ats_pagespeed/ats_process_context.cc|1 + .../ats_pagespeed/ats_resource_intercept.cc | 59 +- plugins/experimental/ats_pagespeed/gzip/misc.h |6 +- .../experimental/background_fetch/Makefile.am |2 +- .../background_fetch/background_fetch.cc| 604 ++--- .../experimental/background_fetch/configs.cc| 124 + plugins/experimental/background_fetch/configs.h | 90 + .../experimental/background_fetch/headers.cc| 129 ++ plugins/experimental/background_fetch/headers.h | 32 + plugins/experimental/background_fetch/rules.cc | 175 ++ plugins/experimental/background_fetch/rules.h | 70 + plugins/experimental/spdy/Makefile.am | 56 - plugins/experimental/spdy/TODO | 20 - plugins/experimental/spdy/http.cc | 264 --- plugins/experimental/spdy/http.h| 89 - plugins/experimental/spdy/io.cc | 89 - plugins/experimental/spdy/io.h | 181 -- plugins/experimental/spdy/lib/base/atomic.h | 62 - plugins/experimental/spdy/lib/base/inet.h | 78 - plugins/experimental/spdy/lib/base/logging.cc | 48 - plugins/experimental/spdy/lib/base/logging.h| 72 - plugins/experimental/spdy/lib/spdy/message.cc | 506 - plugins/experimental/spdy/lib/spdy/spdy.h | 306 --- plugins/experimental/spdy/lib/spdy/zstream.cc | 129 -- plugins/experimental/spdy/lib/spdy/zstream.h| 121 - plugins/experimental/spdy/protocol.cc | 168 -- plugins/experimental/spdy/protocol.h| 31 - plugins/experimental/spdy/spdy.cc | 363 --- plugins/experimental/spdy/stream.cc | 351 --- plugins/experimental/spdy/strings.cc| 100 - plugins/experimental/spdy/tests/stubs.cc| 39 - plugins/experimental/spdy/tests/zstream_test.cc | 194 -- plugins/experimental/xdebug/xdebug.cc |2 + plugins/header_rewrite/conditions.cc| 58 +- plugins/header_rewrite/conditions.h |7 +- plugins/header_rewrite/factory.cc | 12 +- plugins/header_rewrite/header_rewrite.cc| 57 +- plugins/header_r