[trafficserver] branch 6.2.x updated: Mark proxy.config.ssl.SSLv2 and proxy.config.ssl.SSLv3 as deprecated in the docs.

2016-04-17 Thread sorber
This is an automated email from the ASF dual-hosted git repository.

sorber pushed a commit to branch 6.2.x
in repository https://git-dual.apache.org/repos/asf/trafficserver.git

The following commit(s) were added to refs/heads/6.2.x by this push:
   new  d9b5237   Mark proxy.config.ssl.SSLv2 and proxy.config.ssl.SSLv3 as 
deprecated in the docs.
d9b5237 is described below

commit d9b5237255ab86d9013a29562db6b839122cec23
Author: Phil Sorber 
AuthorDate: Sun Apr 17 22:58:51 2016 -0600

Mark proxy.config.ssl.SSLv2 and proxy.config.ssl.SSLv3 as deprecated in the 
docs.
---
 doc/admin-guide/files/records.config.en.rst | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/doc/admin-guide/files/records.config.en.rst 
b/doc/admin-guide/files/records.config.en.rst
index 55ac374..d356cb1 100644
--- a/doc/admin-guide/files/records.config.en.rst
+++ b/doc/admin-guide/files/records.config.en.rst
@@ -2593,13 +2593,21 @@ SSL Termination

ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-DSS-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA256:DHE-RSA-AES128-SHA256:DHE-DSS-AES128-
 [...]
 
 .. ts:cv:: CONFIG proxy.config.ssl.SSLv2 INT 0
+   :deprecated:
+
+   Enables (``1``) or disables (``0``) SSLv2. Please don't enable it unless 
you really know what you are doing and are sure you need this. It is a security 
risk to enable.
 
-   Enables (``1``) or disables (``0``) SSLv2. Please don't enable it.
+   `More Information `_.
 
 .. ts:cv:: CONFIG proxy.config.ssl.SSLv3 INT 0
+   :deprecated:
 
Enables (``1``) or disables (``0``) SSLv3.
 
+   Please don't enable it unless you really know what you are doing and are 
sure you need this. It is a security risk to enable.
+
+   `More Information `_.
+
 .. ts:cv:: CONFIG proxy.config.ssl.TLSv1 INT 1
 
Enables (``1``) or disables (``0``) TLSv1.

-- 
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" '].


[trafficserver] branch master updated: Bump version to 7.0.0

2016-04-17 Thread sorber
This is an automated email from the ASF dual-hosted git repository.

sorber pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git

The following commit(s) were added to refs/heads/master by this push:
   new  5a3af96   Bump version to 7.0.0
5a3af96 is described below

commit 5a3af96aeb1919405284666a61132cf20298806d
Author: Phil Sorber 
AuthorDate: Sun Apr 17 22:31:33 2016 -0600

Bump version to 7.0.0
---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3d38e7d..bac6bf0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,8 +32,8 @@
 # Version number is calculated as MAJOR * 100 + MINOR * 1000 + MICRO
 # Version string is in the form of MAJOR.MINOR.MICRO[sufix]
 #
-m4_define([TS_VERSION_S],[6.2.0])
-m4_define([TS_VERSION_N],[6002000])
+m4_define([TS_VERSION_S],[7.0.0])
+m4_define([TS_VERSION_N],[700])
 
 AC_INIT([Apache Traffic Server], TS_VERSION_S(), 
[d...@trafficserver.apache.org], 
[trafficserver],[http://trafficserver.apache.org])
 AC_PREREQ([2.59])

-- 
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" '].


[trafficserver] branch 6.2.x created (now f949aed)

2016-04-17 Thread sorber
This is an automated email from the ASF dual-hosted git repository.

sorber pushed a change to branch 6.2.x
in repository https://git-dual.apache.org/repos/asf/trafficserver.git.

at  f949aed   TS-4320: Add ACME Plugin

No new revisions were added by this update.

-- 
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" '].


[trafficserver] branch master updated: TS-4320: Add ACME Plugin

2016-04-17 Thread sorber
This is an automated email from the ASF dual-hosted git repository.

sorber pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git

The following commit(s) were added to refs/heads/master by this push:
   new  f949aed   TS-4320: Add ACME Plugin
f949aed is described below

commit f949aed3adbf92620b539e19062bc6a8a0ef54ef
Author: Phil Sorber 
AuthorDate: Mon Apr 11 12:37:52 2016 -0600

TS-4320: Add ACME Plugin
---
 configure.ac|   1 +
 plugins/experimental/Makefile.am|   1 +
 plugins/experimental/{ => acme}/Makefile.am |  54 +
 plugins/experimental/acme/README|   5 +
 plugins/experimental/acme/acme.c| 349 
 5 files changed, 360 insertions(+), 50 deletions(-)

diff --git a/configure.ac b/configure.ac
index d9d6049..3d38e7d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1973,6 +1973,7 @@ AC_CONFIG_FILES([
   plugins/cacheurl/Makefile
   plugins/conf_remap/Makefile
   plugins/experimental/Makefile
+  plugins/experimental/acme/Makefile
   plugins/experimental/authproxy/Makefile
   plugins/experimental/background_fetch/Makefile
   plugins/experimental/balancer/Makefile
diff --git a/plugins/experimental/Makefile.am b/plugins/experimental/Makefile.am
index dd73193..a530a38 100644
--- a/plugins/experimental/Makefile.am
+++ b/plugins/experimental/Makefile.am
@@ -15,6 +15,7 @@
 #  limitations under the License.
 
 SUBDIRS = \
+ acme \
  authproxy \
  background_fetch \
  balancer \
diff --git a/plugins/experimental/Makefile.am 
b/plugins/experimental/acme/Makefile.am
similarity index 52%
copy from plugins/experimental/Makefile.am
copy to plugins/experimental/acme/Makefile.am
index dd73193..3cf70c5 100644
--- a/plugins/experimental/Makefile.am
+++ b/plugins/experimental/acme/Makefile.am
@@ -14,54 +14,8 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-SUBDIRS = \
- authproxy \
- background_fetch \
- balancer \
- buffer_upload \
- cachekey \
- cache_range_requests \
- cache_promote \
- collapsed_connection \
- collapsed_forwarding \
- custom_redirect \
- epic \
- escalate \
- esi \
- generator \
- geoip_acl \
- header_normalize \
- hipes \
- inliner \
- metalink \
- multiplexer \
- memcache \
- memcached_remap \
- regex_revalidate \
- remap_stats \
- s3_auth \
- ssl_cert_loader \
- sslheaders \
- stale_while_revalidate \
- url_sig \
- xdebug \
- mp4 \
- stream_editor
+include $(top_srcdir)/build/plugins.mk
 
-if ENABLE_CPPAPI
-if BUILD_WEBP_TRANSFORM_PLUGIN
- SUBDIRS += webp_transform
-endif
-endif
-
-if HAS_MYSQL
-  SUBDIRS += mysql_remap
-endif
-
-if BUILD_LUAJIT
-  SUBDIRS += ts_lua
-endif
-
-if HAS_KYOTOCABINET
-  SUBDIRS += cache_key_genid
-endif
+pkglib_LTLIBRARIES = acme.la
+acme_la_SOURCES = acme.c
+acme_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
diff --git a/plugins/experimental/acme/README b/plugins/experimental/acme/README
new file mode 100644
index 000..4e6536e
--- /dev/null
+++ b/plugins/experimental/acme/README
@@ -0,0 +1,5 @@
+Plugin to support the ACME protocol
+
+https://github.com/ietf-wg-acme/acme
+
+https://en.wikipedia.org/wiki/Automated_Certificate_Management_Environment
diff --git a/plugins/experimental/acme/acme.c b/plugins/experimental/acme/acme.c
new file mode 100644
index 000..cb0244f
--- /dev/null
+++ b/plugins/experimental/acme/acme.c
@@ -0,0 +1,349 @@
+/** @file
+
+@section license
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+ */
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include "ts/ts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_defs.h"
+
+static const char PLUGIN_NAME[] = "acme";
+static const char ACME_WK_PATH[] = ".well-known/acme-challenge/";
+static const char ACME_OK_RESP[] = "HTTP/1.1 200 OK\r\nContent-Type: 
application/jose\r\nCache-Control: no-cache\r\n";
+static const char ACME_DENIED_RESP[] = "HTTP/1.1 404 Not 
Found\r\nContent-Type: application/jose\r\nCache-Control: no-cache\r\n";
+
+#define MAX_PATH_LEN 4096
+
+/* This should hold all configurations going forward. */
+typedef struct AcmeConfig_t {
+  char *proof;
+} AcmeConfig;
+
+static AcmeConfig gConfig;
+
+/* State used for the intercept plugin. ToDo: Can this be improved ? */
+typedef struct AcmeState_t {
+  TSVConn net_vc;
+  TSVIO read_vio;
+  TSVIO write_vio;
+
+  TSIOBuffer req_buffer;
+  TSIOBuffer resp_buffer;
+  TSIOBufferReader resp_reader;

[trafficserver] 01/02: TS-4164 Update to new clang-format version

2016-04-17 Thread zwoop
This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git

commit f2e3fbbdabc395a53a444f8545f0780bca2d0031
Author: Leif Hedstrom 
AuthorDate: Sat Apr 16 09:47:46 2016 -0600

TS-4164 Update to new clang-format version
---
 .clang-format | 85 +++
 tools/clang-format.sh | 28 -
 2 files changed, 79 insertions(+), 34 deletions(-)

diff --git a/.clang-format b/.clang-format
index 8af2a45..61d0d66 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,62 +1,93 @@
 ---
 Language:Cpp
-# BasedOnStyle:  Mozilla
 AccessModifierOffset: -2
-ConstructorInitializerIndentWidth: 2
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
 AlignEscapedNewlinesLeft: true
+AlignOperands:   true
 AlignTrailingComments: true
 AllowAllParametersOfDeclarationOnNextLine: false
 AllowShortBlocksOnASingleLine: false
 AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Inline
 AllowShortIfStatementsOnASingleLine: false
 AllowShortLoopsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: Inline
-AlwaysBreakAfterDefinitionReturnType: true
-AlwaysBreakTemplateDeclarations: false
+AlwaysBreakAfterDefinitionReturnType: All
+AlwaysBreakAfterReturnType: AllDefinitions
 AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: false
+BinPackArguments: true
+BinPackParameters: true
+BraceWrapping:   
+  AfterClass:  true
+  AfterControlStatement: false
+  AfterEnum:   false
+  AfterFunction:   true
+  AfterNamespace:  true
+  AfterObjCDeclaration: false
+  AfterStruct: true
+  AfterUnion:  false
+  BeforeCatch: false
+  BeforeElse:  false
+  IndentBraces:false
 BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Linux
 BreakBeforeTernaryOperators: false
 BreakConstructorInitializersBeforeComma: false
-BinPackParameters: true
-BinPackArguments: true
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: true
 ColumnLimit: 132
+CommentPragmas:  '^ IWYU pragma:'
 ConstructorInitializerAllOnOneLineOrOnePerLine: false
+ConstructorInitializerIndentWidth: 2
+ContinuationIndentWidth: 2
+Cpp11BracedListStyle: true
 DerivePointerAlignment: false
+DisableFormat:   false
 ExperimentalAutoDetectBinPacking: false
+ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+SortIncludes:false
+IncludeCategories: 
+  - Regex:   '^"(llvm|llvm-c|clang|clang-c)/'
+Priority:2
+  - Regex:   '^(<|"(gtest|isl|json)/)'
+Priority:3
+  - Regex:   '.*'
+Priority:1
+IncludeIsMainRegex: '$'
 IndentCaseLabels: false
+IndentWidth: 2
 IndentWrappedFunctionNames: false
-IndentFunctionDeclarationAfterType: false
-MaxEmptyLinesToKeep: 2
 KeepEmptyLinesAtTheStartOfBlocks: false
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 1
 NamespaceIndentation: Inner
+ObjCBlockIndentWidth: 2
 ObjCSpaceAfterProperty: true
 ObjCSpaceBeforeProtocolList: false
 PenaltyBreakBeforeFirstCallParameter: 19
 PenaltyBreakComment: 300
-PenaltyBreakString: 1000
 PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
 PenaltyExcessCharacter: 100
 PenaltyReturnTypeOnItsOwnLine: 200
 PointerAlignment: Right
-SpacesBeforeTrailingComments: 1
-Cpp11BracedListStyle: true
-Standard:Cpp03
-IndentWidth: 2
-TabWidth:8
-UseTab:  Never
-BreakBeforeBraces: Linux
-SpacesInParentheses: false
-SpacesInSquareBrackets: false
-SpacesInAngles:  false
-SpaceInEmptyParentheses: false
-SpacesInCStyleCastParentheses: false
+ReflowComments:  true
 SpaceAfterCStyleCast: false
-SpacesInContainerLiterals: true
 SpaceBeforeAssignmentOperators: true
-ContinuationIndentWidth: 2
-CommentPragmas:  '^ IWYU pragma:'
-ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
 SpaceBeforeParens: ControlStatements
-DisableFormat:   false
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles:  false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard:Cpp11
+TabWidth:8
+UseTab:  Never
+JavaScriptQuotes: Leave
 ...
 
diff --git a/tools/clang-format.sh b/tools/clang-format.sh
index aab69a0..f9b9544 100755
--- a/tools/clang-format.sh
+++ b/tools/clang-format.sh
@@ -22,7 +22,10 @@ set -e # exit on error
 
 DIR=${1:-.}
 ROOT=${ROOT:-$(git rev-parse --show-toplevel)/.git/fmt}
-URL=${URL:-https://bintray.com/artifact/download/apache/trafficserver/clang-format-20150331.tar.bz2}
+PACKAGE="clang-format-20160415.tar.bz2"
+VERSION="clang-format version 3.9.0 (trunk 265913)"
+
+URL=${URL:-https://bintray.com/artifact/download/apache/trafficserver/${PACKAGE}}
 
 TAR=${TAR:-tar}
 CURL=${CURL:-curl}
@@ -50,16 +53,27 @@ esac
 
 mkdir -p ${ROOT}
 
-if [ ! -e ${FORMAT} ] ; 

[trafficserver] branch master updated (afb415a -> a5cddca)

2016-04-17 Thread zwoop
This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a change to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git.

  from  afb415a   Comment out the invocation for Solaris for the CI
   new  f2e3fbb   TS-4164 Update to new clang-format version
   new  a5cddca   TS-4164 Update indentation with latest tools

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .clang-format  |  85 --
 cmd/traffic_cop/traffic_cop.cc |  11 -
 cmd/traffic_ctl/traffic_ctl.h  |   4 -
 cmd/traffic_layout/traffic_layout.cc   |   2 -
 cmd/traffic_manager/AddConfigFilesHere.cc  |   1 -
 cmd/traffic_manager/StatProcessor.cc   |  11 -
 cmd/traffic_manager/StatProcessor.h|   1 -
 cmd/traffic_manager/StatType.cc|  36 ---
 cmd/traffic_manager/StatType.h |   2 -
 cmd/traffic_manager/StatXML.cc |   1 -
 cmd/traffic_manager/StatXML.h  |   1 -
 cmd/traffic_manager/WebOverview.cc |   4 +-
 cmd/traffic_manager/metrics.cc |   2 -
 cmd/traffic_manager/traffic_manager.cc |   1 -
 cmd/traffic_top/stats.h|   6 -
 cmd/traffic_top/traffic_top.cc |   2 -
 cmd/traffic_via/traffic_via.cc |   2 -
 example/add-header/add-header.c|   1 -
 example/basic-auth/basic-auth.c|   3 -
 example/blacklist-1/blacklist-1.c  |   2 -
 example/cache-scan/cache-scan.cc   |   4 -
 example/intercept/intercept.cc |   6 +-
 example/protocol/Protocol.c|   2 -
 example/protocol/Protocol.h|   1 -
 example/protocol/TxnSM.c   |   1 -
 example/query-remap/query-remap.c  |   4 -
 example/redirect-1/redirect-1.c|   9 -
 example/remap/remap.cc |   4 -
 example/remap_header_add/remap_header_add.cc   |   5 -
 example/response-header-1/response-header-1.c  |   5 -
 example/session-1/session-1.c  |   2 -
 example/ssl-preaccept/ssl-preaccept.cc |   1 -
 example/ssl-sni/ssl-sni.cc |   2 -
 example/thread-1/thread-1.c|   1 -
 example/thread-pool/psi.c  |  16 --
 example/thread-pool/test/SDKTest/psi_server.c  |   2 -
 example/thread-pool/thread.c   |   2 -
 example/thread-pool/thread.h   |   4 -
 example/version/version.c  |   2 +-
 iocore/aio/AIO.cc  |   2 -
 iocore/cache/Cache.cc  |  19 --
 iocore/cache/CacheDir.cc   |  14 +-
 iocore/cache/CacheDisk.cc  |   2 -
 iocore/cache/CacheHosting.cc   |   4 -
 iocore/cache/CacheHttp.cc  |   5 -
 iocore/cache/CachePages.cc |   7 -
 iocore/cache/CachePagesInternal.cc |  10 -
 iocore/cache/CacheRead.cc  |   7 +-
 iocore/cache/CacheTest.cc  |   2 +-
 iocore/cache/CacheVol.cc   |   4 +-
 iocore/cache/CacheWrite.cc |   2 -
 iocore/cache/I_CacheDefs.h |   1 -
 iocore/cache/I_Store.h |  12 +-
 iocore/cache/P_CacheArray.h|   7 +-
 iocore/cache/P_CacheBC.h   |   2 -
 iocore/cache/P_CacheDir.h  |   1 -
 iocore/cache/P_CacheDisk.h |   1 -
 iocore/cache/P_CacheHosting.h  |   2 -
 iocore/cache/P_CacheHttp.h |   2 -
 iocore/cache/P_CacheInternal.h |   5 -
 iocore/cache/P_CacheVol.h  |   6 -
 iocore/cache/RamCacheCLFUS.cc  |   3 +-
 iocore/cache/Store.cc  |  12 +-
 iocore/cluster/ClusterAPI.cc   |   1 -
 iocore/cluster/ClusterCache.cc |   6 -
 iocore/cluster/ClusterConfig.cc|   1 -
 iocore/cluster/ClusterHandler.cc   |   2 -
 iocore/cluster/ClusterHandlerBase.cc   |   1 -
 iocore/cluster/ClusterHash.cc  |   2 -
 iocore/cluster/ClusterLib.cc   |   1 -
 iocore/cluster/ClusterLoadMonitor.cc   |   1 -
 iocore/cluster/ClusterProcessor.cc |   1 -