This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch quic-latest
in repository https://gitbox.apache.org/repos/asf/trafficserver.git

commit 3467144cfef30841cc10785ebbbabf6d5a4aa253
Merge: 387323a 20db74b
Author: Leif Hedstrom <zw...@apache.org>
AuthorDate: Wed Mar 7 14:10:36 2018 -0800

    Merge branch 'master' into quic-latest
    
    * master: (49 commits)
      s3_auth: check if previous config (re)load failed
      Fix string_view hash function
      all or nothing for readIntoBuffer
      Diagnostic message when openning hostdb file fails
      Fixing #3232, crash when making a server push
      Add option to always add Client-ip header
      disable fips when TS_ENABLE_FIPS == 0
      Select the current cert when looking for issuer
      Respond with 400 code when Content-Length headers mismatch, remove 
duplicate copies of the Content-Length header with exactly same values, and 
remove Content-Length headers if Transfer-Encoding header exists.
      Fix default include path ordering.
      remove HAVE_POSIX_MEMALIGN related code
      Acquire lock before calling Http2ClientSession::free() from 
Http2ConnectionState
      Combine mutex of Http2ClientSession and Http2ConnectionState
      Removed MD5 signature values based on ASF updated release policy  New 
policy :      -- MUST provide a SHA- or MD5-file      -- SHOULD provide a 
SHA-file      -- SHOULD NOT provide a MD5-file
      Add declaration of ssl_verify_client_callback
      Optimize: define AIO_Reqs::aio_temp_list by ASLL macro
      fix unpredictable diskok within CacheProcessor::start_internal
      Create a new AIOCallback to call back aio_err_callbck if there is an 
error from Linux Native AIO
      Remove unused SHARED_* build variables.
      Client verify callback with client verify hook
      ...
    
     Conflicts:
        proxy/http/Makefile.am

 Makefile.am                                        |   2 -
 cmd/traffic_cop/Makefile.am                        |   6 +-
 cmd/traffic_crashlog/Makefile.am                   |   3 +-
 cmd/traffic_ctl/Makefile.am                        |   3 +-
 cmd/traffic_layout/Makefile.am                     |   3 +-
 cmd/traffic_manager/Makefile.am                    |   3 +-
 cmd/traffic_top/Makefile.am                        |   1 +
 cmd/traffic_via/Makefile.am                        |   3 +-
 cmd/traffic_wccp/Makefile.am                       |   4 +-
 configure.ac                                       |  38 ++-
 doc/admin-guide/files/records.config.en.rst        |  27 +-
 .../files/ssl_server_name.config.en.rst            |   8 +-
 doc/admin-guide/plugins/fq_pacing.en.rst           |  48 ++++
 doc/admin-guide/plugins/index.en.rst               |   4 +
 doc/admin-guide/plugins/xdebug.en.rst              |   4 +
 .../api/functions/TSRemapFromToUrlGet.en.rst       |  40 +++
 .../api/functions/TSUrlStringGet.en.rst            |   2 +-
 doc/developer-guide/api/types/TSHttpHookID.en.rst  |   2 +
 .../internal-libraries/buffer-writer.en.rst        | 302 +++++++++++++++++++
 .../internal-libraries/index.en.rst                |   1 +
 example/Makefile.am                                |   4 +-
 example/remap/remap.cc                             |   2 +-
 example/verify_cert/verify_cert.cc                 | 119 ++++++++
 iocore/aio/AIO.cc                                  |  71 ++---
 iocore/aio/I_AIO.h                                 |   8 +-
 iocore/aio/Makefile.am                             |   3 +-
 iocore/aio/P_AIO.h                                 |  71 +++--
 iocore/cache/Cache.cc                              |   9 +-
 iocore/cache/Makefile.am                           |  17 +-
 iocore/cache/P_CacheVol.h                          |  10 +-
 iocore/dns/Makefile.am                             |   3 +-
 iocore/eventsystem/I_MIOBufferWriter.h             |   4 +-
 iocore/eventsystem/Makefile.am                     |   3 +-
 .../eventsystem/unit-tests/test_MIOBufferWriter.cc |   4 +-
 iocore/hostdb/Makefile.am                          |   3 +-
 iocore/hostdb/P_RefCountCache.h                    |   3 +-
 iocore/hostdb/P_RefCountCacheSerializer.h          |   2 +-
 iocore/net/Makefile.am                             |   1 +
 iocore/net/OCSPStapling.cc                         |   7 +
 iocore/net/P_SSLConfig.h                           |   2 +-
 iocore/net/P_SSLNetVConnection.h                   |   9 +
 iocore/net/SSLClientUtils.cc                       |   6 +-
 iocore/net/SSLConfig.cc                            |  15 +-
 iocore/net/SSLNetVConnection.cc                    |  25 +-
 iocore/net/SSLUtils.cc                             |  14 +-
 iocore/utils/Makefile.am                           |   3 +-
 lib/bindings/Makefile.am                           |   3 +-
 lib/perl/Makefile.PL                               |   7 +
 lib/records/Makefile.am                            |   3 +-
 lib/ts/BufferWriter.h                              | 319 +++++++++++++++------
 lib/ts/CryptoHash.cc                               |  18 +-
 lib/ts/CryptoHash.h                                |   4 +-
 lib/ts/Diags.cc                                    | 144 ++++------
 lib/ts/INK_MD5.h                                   |   3 -
 lib/ts/Makefile.am                                 |   9 +-
 lib/ts/MatcherUtils.cc                             |  12 +-
 lib/ts/SHA256.h                                    |   7 +-
 lib/ts/apidefs.h.in                                |   4 +-
 lib/ts/ink_code.cc                                 |   2 +-
 lib/ts/ink_code.h                                  |   2 +-
 lib/ts/ink_error.cc                                |  18 +-
 lib/ts/ink_memory.cc                               |   8 +-
 lib/ts/ink_queue.cc                                |  10 -
 lib/ts/string_view.h                               |   8 +-
 lib/ts/unit-tests/test_BufferWriter.cc             |  45 ++-
 lib/ts/unit-tests/test_string_view.cc              |   9 +
 lib/tsconfig/Makefile.am                           |   3 +-
 lib/wccp/Makefile.am                               |   3 +-
 mgmt/Makefile.am                                   |   3 +-
 mgmt/RecordsConfig.cc                              |   2 +-
 mgmt/api/Makefile.am                               |   1 +
 mgmt/utils/Makefile.am                             |   1 +
 plugins/Makefile.am                                |   1 +
 plugins/background_fetch/background_fetch.cc       |   2 +-
 plugins/experimental/acme/acme.c                   |   6 +-
 .../experimental/cache_promote/cache_promote.cc    |   2 +-
 .../cache_range_requests/cache_range_requests.cc   |   2 +-
 .../collapsed_connection/collapsed_connection.cc   |   2 +-
 .../experimental/fq_pacing/Makefile.inc            |  10 +-
 plugins/experimental/fq_pacing/README.md           |  22 ++
 plugins/experimental/fq_pacing/fq_pacing.c         | 237 +++++++++++++++
 plugins/experimental/geoip_acl/geoip_acl.cc        |   2 +-
 .../header_normalize/header_normalize.cc           |   2 +-
 plugins/experimental/hipes/hipes.cc                |   2 +-
 plugins/experimental/money_trace/money_trace.cc    |   2 +-
 plugins/experimental/tls_bridge/tls_bridge.cc      |   2 +-
 plugins/experimental/ts_lua/ts_lua_util.c          |   8 +-
 plugins/experimental/uri_signing/README.md         |  29 ++
 plugins/experimental/uri_signing/config.c          |  94 +++++-
 plugins/experimental/uri_signing/config.h          |   4 +
 plugins/experimental/uri_signing/jwt.c             |   6 +-
 plugins/experimental/uri_signing/jwt.h             |   2 +-
 plugins/experimental/uri_signing/parse.c           |   2 +-
 plugins/experimental/uri_signing/uri_signing.c     |  37 ++-
 plugins/gzip/gzip.cc                               |   2 +-
 plugins/header_rewrite/header_rewrite.cc           |   2 +-
 plugins/header_rewrite/operators.cc                |   8 +-
 plugins/healthchecks/healthchecks.c                |   2 +-
 plugins/regex_remap/regex_remap.cc                 |   2 +-
 plugins/s3_auth/s3_auth.cc                         |   7 +-
 plugins/xdebug/xdebug.cc                           |  68 ++++-
 proxy/HostStatus.cc                                |  59 ++++
 proxy/HostStatus.h                                 |  68 +++++
 proxy/InkAPI.cc                                    |  52 +++-
 proxy/InkAPIInternal.h                             |   1 +
 proxy/InkAPITest.cc                                |   1 +
 proxy/Main.cc                                      |   2 +-
 proxy/Makefile.am                                  |   5 +-
 proxy/ParentConsistentHash.cc                      |   7 +-
 proxy/ParentRoundRobin.cc                          |  12 +-
 proxy/ParentSelection.cc                           |  82 ++++++
 proxy/api/ts/ts.h                                  |  12 +
 proxy/congest/Makefile.am                          |   3 +-
 proxy/hdrs/HTTP.cc                                 |  60 +++-
 proxy/hdrs/HTTP.h                                  |   1 +
 proxy/hdrs/HdrTest.cc                              |   2 +-
 proxy/hdrs/MIME.cc                                 |  23 +-
 proxy/hdrs/Makefile.am                             |   3 +-
 proxy/http/HttpConfig.cc                           |   2 +-
 proxy/http/HttpDebugNames.cc                       |   2 +
 proxy/http/HttpSM.cc                               |  18 +-
 proxy/http/HttpTransact.cc                         |  34 ++-
 proxy/http/HttpTransactHeaders.cc                  |   8 +-
 proxy/http/Makefile.am                             |   3 +-
 proxy/http/remap/Makefile.am                       |   3 +-
 proxy/http/remap/RemapConfig.cc                    |   4 +-
 proxy/http/remap/UrlRewrite.cc                     |   2 +-
 proxy/http2/Http2ClientSession.cc                  |   2 +-
 proxy/http2/Http2ConnectionState.cc                |  37 ++-
 proxy/http2/Http2ConnectionState.h                 |   5 +
 proxy/http2/Http2Stream.cc                         |   3 +-
 proxy/http2/Makefile.am                            |   3 +-
 proxy/logging/Makefile.am                          |   3 +-
 proxy/shared/Makefile.am                           |   5 +-
 rc/Makefile.am                                     |   8 -
 tests/gold_tests/headers/syntax.200.gold           |   6 +
 tests/gold_tests/headers/syntax.400.gold           |   4 +
 tests/gold_tests/headers/syntax.test.py            | 105 +++++++
 tests/gold_tests/pluginTest/xdebug/x_remap/none.in |   4 +
 tests/gold_tests/pluginTest/xdebug/x_remap/one.in  |   4 +
 .../gold_tests/pluginTest/xdebug/x_remap/out.gold  |  61 ++++
 .../gold_tests/pluginTest/xdebug/x_remap/three.in  |   4 +
 tests/gold_tests/pluginTest/xdebug/x_remap/two.in  |   4 +
 .../pluginTest/xdebug/x_remap/x_remap.test.py      |  75 +++++
 tests/unit_tests/Makefile.am                       |   3 +-
 tools/Makefile.am                                  |   6 +-
 tools/check-unused-dependencies                    |  19 +-
 tools/jtest/jtest.cc                               |  12 -
 tools/package/trafficserver.spec                   | 185 ++++++++++++
 149 files changed, 2592 insertions(+), 572 deletions(-)

diff --cc proxy/http/Makefile.am
index ed1aee2,0f2956e..fda9aca
--- a/proxy/http/Makefile.am
+++ b/proxy/http/Makefile.am
@@@ -32,7 -32,7 +32,8 @@@ AM_CPPFLAGS += 
    -I$(abs_top_srcdir)/proxy/http/remap \
    -I$(abs_top_srcdir)/proxy/logging \
    -I$(abs_top_srcdir)/proxy/http2 \
-   -I$(abs_top_srcdir)/proxy/hq
++  -I$(abs_top_srcdir)/proxy/hq \
+   $(TS_INCLUDES)
  
  noinst_HEADERS = HttpProxyServerMain.h
  noinst_LIBRARIES = libhttp.a

-- 
To stop receiving notification emails like this one, please contact
zw...@apache.org.

Reply via email to