You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by br...@apache.org on 2015/05/18 07:33:22 UTC

[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 <br...@apache.org>
Authored: Sun May 17 22:24:50 2015 -0700
Committer: Brian Geffon <br...@apache.org>
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_rewrite/matcher.h                |    2 +-
 plugins/tcpinfo/tcpinfo.cc                      |    8 +-
 proxy/InkAPI.cc                                 |   10 +-
 proxy/PluginVC.cc                               |    3 +-
 proxy/ProxyClientSession.cc                     |   10 +-
 proxy/ProxyClientSession.h                      |    7 +-
 proxy/StatSystem.h                              |   14 +-
 proxy/http/HttpClientSession.cc                 |    6 +-
 proxy/http/HttpClientSession.h                  |    8 +-
 proxy/http/HttpSM.cc                            |   59 +-
 proxy/http/HttpSM.h                             |    1 +
 proxy/http/HttpTransact.cc                      |   16 +-
 proxy/http/remap/AclFiltering.h                 |    4 +-
 proxy/http/remap/RemapConfig.h                  |    2 +-
 proxy/http2/HTTP2.cc                            |    2 +
 proxy/http2/Http2ClientSession.cc               |    5 +-
 proxy/http2/Http2ClientSession.h                |   13 +-
 proxy/http2/Http2ConnectionState.cc             |    2 +-
 proxy/spdy/Makefile.am                          |    2 +
 proxy/spdy/SpdyCallbacks.cc                     |    3 +
 proxy/spdy/SpdyClientSession.cc                 |   42 +-
 proxy/spdy/SpdyClientSession.h                  |   52 +-
 proxy/spdy/SpdySessionAccept.cc                 |    8 +-
 96 files changed, 3224 insertions(+), 5217 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/cc40b928/iocore/net/SSLUtils.cc
----------------------------------------------------------------------