You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ma...@apache.org on 2018/02/20 12:13:14 UTC
[trafficserver] branch quic-latest updated (39c8009 -> 3405854)
This is an automated email from the ASF dual-hosted git repository.
maskit pushed a change to branch quic-latest
in repository https://gitbox.apache.org/repos/asf/trafficserver.git.
from 39c8009 Add QUICHKDF.h
add f14efb4 Adds a new header_rewrite condition %{CIDR}
add 4936f48 Restores traffic_top -s option to be in seconds
add 9f86851 Kill unused .c file with C++ code.
add f6499a3 ats_pagespeed: axe it out (new home: the Apache PageSpeed repo)
add 19a6041 More AUTest test cases for HTTP/2
add 17f0e83 Cleanup Http2Stream
add 3b279f4 TextView: Fix svtoi for other bases, operator!, add verification tests.
add 7bda058 More documentation for internal cache data structures
add 13734be Add debug diagnostics for the final cache key string
add ea85a7d use schedule_spawn to start accept threads when set to 0
add b57c0d1 Decrement stream counts just after the stream is removed from stream_list
add 5675f7d Replaces TSHttpTxnFollowRedirect with TSHttpTxnConfigIntSet for Lua
add 3b48c5e Adds a new configuration proxy.config.http.allow_multi_range
add 2861150 Use the correct Lua symbol for verify-server setting
add 82d7209 Mark TSHttpTxnFollowRedirect() as deprecated.
add e459667 Doc: Add java/plantuml dependency to building the documentation.
add dd533f5 Doc: Clean up build warnings.
add 7ef6d29 Ignores the ICC warning on expression constants to asserts
add 1916eb0 Doc: Remove man page reference to congestion.config which no longer exists.
add bd76ad5 Added -f to rm to fix build
add 7f1b208 Test: fix string_view unit test.
add c0c1b2a Disables the support for multi-range request by default
add 08b9ade Don't read DNS responses until we get at least two bytes
add eceff01 Remove all references to TS_USE_TLS_SNI
add 25ccc06 Removed checks for SNI support for autoconf
add 5ed6a72 Fix documentation for transaction_active_timeout_in default value.
add e3c64e1 Add TLS Bridge plugin to plugins/experimental.
add ed479e2 Add path param url signing option and client ipv6 verification to url_sig.
add 066c835 Add move operator and constructor to Result and TextBuffer
add cca9a1a corrects off-by-one error, adds test
add e4aa18e Doc: Add internal documenation for ts::string_view.
new 3405854 Merge branch 'master' into quic-latest
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
NOTICE | 8 -
build/crypto.m4 | 47 +-
cmd/traffic_layout/info.cc | 1 -
cmd/traffic_top/traffic_top.cc | 4 +-
configure.ac | 22 +-
doc/.gitignore | 3 +
doc/Makefile.am | 2 +
doc/admin-guide/files/records.config.en.rst | 20 +-
doc/admin-guide/performance/index.en.rst | 5 +-
doc/admin-guide/plugins/header_rewrite.en.rst | 33 +
doc/admin-guide/plugins/url_sig.en.rst | 15 +-
doc/checkvers.py | 8 +
doc/conf.py | 4 +
.../api/functions/TSHttpOverridableConfig.en.rst | 1 +
doc/developer-guide/api/functions/TSTypes.en.rst | 26 +
doc/developer-guide/api/types/CoreTypes.en.rst | 14 -
.../api/types/TSOverridableConfigKey.en.rst | 1 +
.../cache-architecture/data-structures.en.rst | 119 +-
.../internal-libraries/index.en.rst | 3 +-
.../internal-libraries/string_view.en.rst | 65 +
.../plugins/example-plugins/index.en.rst | 1 +
.../plugins/example-plugins/tls_bridge.en.rst | 245 ++++
.../rules/rule.conf => doc/ext/local-config.py.in | 5 +-
.../admin-guide/files/records.config.en.po | 4 +-
doc/manpages.py | 1 -
doc/plantuml_fetch.sh | 60 +
doc/sbuild | 13 +-
doc/uml/Makefile | 23 -
.../Makefile.inc => doc/uml/Makefile.am | 42 +-
doc/uml/TLS-Bridge-Messages.uml | 80 ++
doc/uml/TLS-Bridge-Plugin.uml | 81 ++
doc/uml/images/.gitignore | 5 -
doc/uml/images/l4-basic-sequence.svg | 30 -
doc/uml/images/l4-example-cdn-layout.svg | 27 -
doc/uml/images/l4-sni-routing-seq.svg | 34 -
iocore/dns/DNS.cc | 13 +-
iocore/net/Makefile.am | 5 -
iocore/net/NetTest-http-server.c | 174 ---
iocore/net/P_NetAccept.h | 4 +
iocore/net/SSLNetVConnection.cc | 21 +-
iocore/net/SSLSNIConfig.cc | 2 +-
iocore/net/SSLUtils.cc | 5 -
iocore/net/UnixNetAccept.cc | 4 +
iocore/net/UnixNetProcessor.cc | 8 +-
lib/ts/BufferWriter.h | 2 +-
lib/ts/Result.h | 14 +
lib/ts/TextBuffer.h | 11 +
lib/ts/TextView.cc | 19 +-
lib/ts/TextView.h | 5 +-
lib/ts/apidefs.h.in | 1 +
lib/ts/ink_config.h.in | 1 -
lib/ts/unit-tests/test_BufferWriter.cc | 17 +
lib/ts/unit-tests/test_TextView.cc | 35 +-
lib/ts/unit-tests/test_string_view.cc | 8 +-
mgmt/RecordsConfig.cc | 2 +
plugins/Makefile.am | 1 +
plugins/experimental/ats_pagespeed/.gitignore | 15 -
plugins/experimental/ats_pagespeed/Makefile | 83 --
.../ats_pagespeed/Makefile.psol_source | 49 -
plugins/experimental/ats_pagespeed/README.md | 53 -
.../experimental/ats_pagespeed/ats_base_fetch.cc | 239 ----
.../experimental/ats_pagespeed/ats_base_fetch.h | 110 --
.../ats_pagespeed/ats_beacon_intercept.cc | 374 ------
.../ats_pagespeed/ats_beacon_intercept.h | 31 -
plugins/experimental/ats_pagespeed/ats_config.cc | 217 ----
plugins/experimental/ats_pagespeed/ats_config.h | 108 --
.../experimental/ats_pagespeed/ats_header_utils.cc | 101 --
.../experimental/ats_pagespeed/ats_header_utils.h | 40 -
.../ats_pagespeed/ats_log_message_handler.cc | 100 --
.../ats_pagespeed/ats_log_message_handler.h | 36 -
.../ats_pagespeed/ats_message_handler.cc | 114 --
.../ats_pagespeed/ats_message_handler.h | 77 --
.../experimental/ats_pagespeed/ats_pagespeed.cc | 1283 --------------------
plugins/experimental/ats_pagespeed/ats_pagespeed.h | 104 --
.../ats_pagespeed/ats_process_context.cc | 87 --
.../ats_pagespeed/ats_process_context.h | 75 --
.../ats_pagespeed/ats_resource_intercept.cc | 349 ------
.../ats_pagespeed/ats_resource_intercept.h | 64 -
.../ats_pagespeed/ats_rewrite_driver_factory.cc | 215 ----
.../ats_pagespeed/ats_rewrite_driver_factory.h | 118 --
.../ats_pagespeed/ats_rewrite_options.cc | 266 ----
.../ats_pagespeed/ats_rewrite_options.h | 95 --
.../ats_pagespeed/ats_server_context.cc | 48 -
.../ats_pagespeed/ats_server_context.h | 63 -
.../experimental/ats_pagespeed/ats_thread_system.h | 52 -
plugins/experimental/ats_pagespeed/gzip/Makefile | 24 -
plugins/experimental/ats_pagespeed/gzip/README | 4 -
.../ats_pagespeed/gzip/configuration.cc | 286 -----
.../ats_pagespeed/gzip/configuration.h | 111 --
.../experimental/ats_pagespeed/gzip/debug_macros.h | 64 -
plugins/experimental/ats_pagespeed/gzip/gzip.cc | 805 ------------
.../experimental/ats_pagespeed/gzip/gzip.config | 6 -
plugins/experimental/ats_pagespeed/gzip/misc.cc | 197 ---
plugins/experimental/ats_pagespeed/gzip/misc.h | 75 --
.../ats_pagespeed/scripts/prepare_psol.sh | 93 --
.../ssl_cert_loader/ssl-cert-loader.cc | 12 -
.../{money_trace => tls_bridge}/Makefile.inc | 8 +-
plugins/experimental/tls_bridge/README | 20 +
plugins/experimental/tls_bridge/regex.cc | 126 ++
.../experimental/tls_bridge/regex.h | 64 +-
plugins/experimental/tls_bridge/tls_bridge.cc | 630 ++++++++++
plugins/experimental/ts_lua/ts_lua_http_config.c | 7 +-
plugins/experimental/url_sig/README | 57 +-
plugins/experimental/url_sig/sign.pl | 167 ++-
plugins/experimental/url_sig/url_sig.c | 261 +++-
plugins/experimental/url_sig/url_sig.h | 1 +
plugins/header_rewrite/conditions.cc | 99 ++
plugins/header_rewrite/conditions.h | 32 +
plugins/header_rewrite/factory.cc | 2 +
proxy/InkAPI.cc | 16 +-
proxy/InkAPITest.cc | 3 +-
proxy/Main.cc | 33 +-
proxy/api/ts/ts.h | 27 +-
proxy/hdrs/URL.cc | 8 +-
proxy/http/HttpConfig.cc | 2 +
proxy/http/HttpConfig.h | 2 +
proxy/http/HttpProxyServerMain.cc | 39 +-
proxy/http/HttpProxyServerMain.h | 17 +-
proxy/http/HttpSM.cc | 49 +-
proxy/http2/Http2ConnectionState.cc | 20 +-
proxy/http2/Http2Stream.cc | 115 +-
proxy/http2/Http2Stream.h | 4 +-
tests/README.md | 1 -
...httpbin_0_stderr.gold => httpbin_1_stderr.gold} | 6 +-
.../sni-1.gold => h2/gold/httpbin_1_stdout.gold} | 0
...httpbin_0_stderr.gold => httpbin_2_stderr.gold} | 5 +-
tests/gold_tests/h2/gold/httpbin_2_stdout.gold | 1 +
tests/gold_tests/h2/gold/httpbin_access.gold | 3 +
tests/gold_tests/h2/httpbin.test.py | 45 +-
129 files changed, 2584 insertions(+), 6933 deletions(-)
create mode 100644 doc/.gitignore
create mode 100644 doc/developer-guide/internal-libraries/string_view.en.rst
create mode 100644 doc/developer-guide/plugins/example-plugins/tls_bridge.en.rst
copy tests/gold_tests/pluginTest/header_rewrite/rules/rule.conf => doc/ext/local-config.py.in (89%)
create mode 100755 doc/plantuml_fetch.sh
delete mode 100644 doc/uml/Makefile
copy plugins/experimental/money_trace/Makefile.inc => doc/uml/Makefile.am (51%)
create mode 100644 doc/uml/TLS-Bridge-Messages.uml
create mode 100644 doc/uml/TLS-Bridge-Plugin.uml
delete mode 100644 doc/uml/images/.gitignore
delete mode 100644 doc/uml/images/l4-basic-sequence.svg
delete mode 100644 doc/uml/images/l4-example-cdn-layout.svg
delete mode 100644 doc/uml/images/l4-sni-routing-seq.svg
delete mode 100644 iocore/net/NetTest-http-server.c
delete mode 100644 plugins/experimental/ats_pagespeed/.gitignore
delete mode 100644 plugins/experimental/ats_pagespeed/Makefile
delete mode 100755 plugins/experimental/ats_pagespeed/Makefile.psol_source
delete mode 100644 plugins/experimental/ats_pagespeed/README.md
delete mode 100644 plugins/experimental/ats_pagespeed/ats_base_fetch.cc
delete mode 100644 plugins/experimental/ats_pagespeed/ats_base_fetch.h
delete mode 100644 plugins/experimental/ats_pagespeed/ats_beacon_intercept.cc
delete mode 100644 plugins/experimental/ats_pagespeed/ats_beacon_intercept.h
delete mode 100644 plugins/experimental/ats_pagespeed/ats_config.cc
delete mode 100644 plugins/experimental/ats_pagespeed/ats_config.h
delete mode 100644 plugins/experimental/ats_pagespeed/ats_header_utils.cc
delete mode 100644 plugins/experimental/ats_pagespeed/ats_header_utils.h
delete mode 100644 plugins/experimental/ats_pagespeed/ats_log_message_handler.cc
delete mode 100644 plugins/experimental/ats_pagespeed/ats_log_message_handler.h
delete mode 100644 plugins/experimental/ats_pagespeed/ats_message_handler.cc
delete mode 100644 plugins/experimental/ats_pagespeed/ats_message_handler.h
delete mode 100644 plugins/experimental/ats_pagespeed/ats_pagespeed.cc
delete mode 100644 plugins/experimental/ats_pagespeed/ats_pagespeed.h
delete mode 100644 plugins/experimental/ats_pagespeed/ats_process_context.cc
delete mode 100644 plugins/experimental/ats_pagespeed/ats_process_context.h
delete mode 100644 plugins/experimental/ats_pagespeed/ats_resource_intercept.cc
delete mode 100644 plugins/experimental/ats_pagespeed/ats_resource_intercept.h
delete mode 100644 plugins/experimental/ats_pagespeed/ats_rewrite_driver_factory.cc
delete mode 100644 plugins/experimental/ats_pagespeed/ats_rewrite_driver_factory.h
delete mode 100644 plugins/experimental/ats_pagespeed/ats_rewrite_options.cc
delete mode 100644 plugins/experimental/ats_pagespeed/ats_rewrite_options.h
delete mode 100644 plugins/experimental/ats_pagespeed/ats_server_context.cc
delete mode 100644 plugins/experimental/ats_pagespeed/ats_server_context.h
delete mode 100644 plugins/experimental/ats_pagespeed/ats_thread_system.h
delete mode 100644 plugins/experimental/ats_pagespeed/gzip/Makefile
delete mode 100644 plugins/experimental/ats_pagespeed/gzip/README
delete mode 100644 plugins/experimental/ats_pagespeed/gzip/configuration.cc
delete mode 100644 plugins/experimental/ats_pagespeed/gzip/configuration.h
delete mode 100644 plugins/experimental/ats_pagespeed/gzip/debug_macros.h
delete mode 100644 plugins/experimental/ats_pagespeed/gzip/gzip.cc
delete mode 100644 plugins/experimental/ats_pagespeed/gzip/gzip.config
delete mode 100644 plugins/experimental/ats_pagespeed/gzip/misc.cc
delete mode 100644 plugins/experimental/ats_pagespeed/gzip/misc.h
delete mode 100755 plugins/experimental/ats_pagespeed/scripts/prepare_psol.sh
copy plugins/experimental/{money_trace => tls_bridge}/Makefile.inc (78%)
create mode 100644 plugins/experimental/tls_bridge/README
create mode 100644 plugins/experimental/tls_bridge/regex.cc
copy lib/ts/Regex.h => plugins/experimental/tls_bridge/regex.h (51%)
create mode 100644 plugins/experimental/tls_bridge/tls_bridge.cc
copy tests/gold_tests/h2/gold/{httpbin_0_stderr.gold => httpbin_1_stderr.gold} (63%)
copy tests/gold_tests/{tls_hooks/gold/sni-1.gold => h2/gold/httpbin_1_stdout.gold} (100%)
copy tests/gold_tests/h2/gold/{httpbin_0_stderr.gold => httpbin_2_stderr.gold} (63%)
create mode 100644 tests/gold_tests/h2/gold/httpbin_2_stdout.gold
create mode 100644 tests/gold_tests/h2/gold/httpbin_access.gold
--
To stop receiving notification emails like this one, please contact
maskit@apache.org.
[trafficserver] 01/01: Merge branch 'master' into quic-latest
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
maskit pushed a commit to branch quic-latest
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 3405854015c379bb61250d6736c459288e4aaa4f
Merge: 39c8009 e4aa18e
Author: Masakazu Kitajo <ma...@apache.org>
AuthorDate: Tue Feb 20 21:12:24 2018 +0900
Merge branch 'master' into quic-latest
Conflicts:
iocore/net/Makefile.am
proxy/Main.cc
proxy/http/HttpProxyServerMain.cc
NOTICE | 8 -
build/crypto.m4 | 47 +-
cmd/traffic_layout/info.cc | 1 -
cmd/traffic_top/traffic_top.cc | 4 +-
configure.ac | 22 +-
doc/.gitignore | 3 +
doc/Makefile.am | 2 +
doc/admin-guide/files/records.config.en.rst | 20 +-
doc/admin-guide/performance/index.en.rst | 5 +-
doc/admin-guide/plugins/header_rewrite.en.rst | 33 +
doc/admin-guide/plugins/url_sig.en.rst | 15 +-
doc/checkvers.py | 8 +
doc/conf.py | 4 +
.../api/functions/TSHttpOverridableConfig.en.rst | 1 +
doc/developer-guide/api/functions/TSTypes.en.rst | 26 +
doc/developer-guide/api/types/CoreTypes.en.rst | 14 -
.../api/types/TSOverridableConfigKey.en.rst | 1 +
.../cache-architecture/data-structures.en.rst | 119 +-
.../internal-libraries/index.en.rst | 3 +-
.../internal-libraries/string_view.en.rst | 65 +
.../plugins/example-plugins/index.en.rst | 1 +
.../plugins/example-plugins/tls_bridge.en.rst | 245 ++++
doc/ext/local-config.py.in | 18 +
.../admin-guide/files/records.config.en.po | 4 +-
doc/manpages.py | 1 -
doc/plantuml_fetch.sh | 60 +
doc/sbuild | 13 +-
doc/uml/Makefile | 23 -
doc/uml/Makefile.am | 57 +
doc/uml/TLS-Bridge-Messages.uml | 80 ++
doc/uml/TLS-Bridge-Plugin.uml | 81 ++
doc/uml/images/.gitignore | 5 -
doc/uml/images/l4-basic-sequence.svg | 30 -
doc/uml/images/l4-example-cdn-layout.svg | 27 -
doc/uml/images/l4-sni-routing-seq.svg | 34 -
iocore/dns/DNS.cc | 13 +-
iocore/net/Makefile.am | 5 -
iocore/net/NetTest-http-server.c | 174 ---
iocore/net/P_NetAccept.h | 4 +
iocore/net/SSLNetVConnection.cc | 21 +-
iocore/net/SSLSNIConfig.cc | 2 +-
iocore/net/SSLUtils.cc | 5 -
iocore/net/UnixNetAccept.cc | 4 +
iocore/net/UnixNetProcessor.cc | 8 +-
lib/ts/BufferWriter.h | 2 +-
lib/ts/Result.h | 14 +
lib/ts/TextBuffer.h | 11 +
lib/ts/TextView.cc | 19 +-
lib/ts/TextView.h | 5 +-
lib/ts/apidefs.h.in | 1 +
lib/ts/ink_config.h.in | 1 -
lib/ts/unit-tests/test_BufferWriter.cc | 17 +
lib/ts/unit-tests/test_TextView.cc | 35 +-
lib/ts/unit-tests/test_string_view.cc | 8 +-
mgmt/RecordsConfig.cc | 2 +
plugins/Makefile.am | 1 +
plugins/experimental/ats_pagespeed/.gitignore | 15 -
plugins/experimental/ats_pagespeed/Makefile | 83 --
.../ats_pagespeed/Makefile.psol_source | 49 -
plugins/experimental/ats_pagespeed/README.md | 53 -
.../experimental/ats_pagespeed/ats_base_fetch.cc | 239 ----
.../experimental/ats_pagespeed/ats_base_fetch.h | 110 --
.../ats_pagespeed/ats_beacon_intercept.cc | 374 ------
.../ats_pagespeed/ats_beacon_intercept.h | 31 -
plugins/experimental/ats_pagespeed/ats_config.cc | 217 ----
plugins/experimental/ats_pagespeed/ats_config.h | 108 --
.../experimental/ats_pagespeed/ats_header_utils.cc | 101 --
.../experimental/ats_pagespeed/ats_header_utils.h | 40 -
.../ats_pagespeed/ats_log_message_handler.cc | 100 --
.../ats_pagespeed/ats_log_message_handler.h | 36 -
.../ats_pagespeed/ats_message_handler.cc | 114 --
.../ats_pagespeed/ats_message_handler.h | 77 --
.../experimental/ats_pagespeed/ats_pagespeed.cc | 1283 --------------------
plugins/experimental/ats_pagespeed/ats_pagespeed.h | 104 --
.../ats_pagespeed/ats_process_context.cc | 87 --
.../ats_pagespeed/ats_process_context.h | 75 --
.../ats_pagespeed/ats_resource_intercept.cc | 349 ------
.../ats_pagespeed/ats_resource_intercept.h | 64 -
.../ats_pagespeed/ats_rewrite_driver_factory.cc | 215 ----
.../ats_pagespeed/ats_rewrite_driver_factory.h | 118 --
.../ats_pagespeed/ats_rewrite_options.cc | 266 ----
.../ats_pagespeed/ats_rewrite_options.h | 95 --
.../ats_pagespeed/ats_server_context.cc | 48 -
.../ats_pagespeed/ats_server_context.h | 63 -
.../experimental/ats_pagespeed/ats_thread_system.h | 52 -
plugins/experimental/ats_pagespeed/gzip/README | 4 -
.../ats_pagespeed/gzip/configuration.cc | 286 -----
.../ats_pagespeed/gzip/configuration.h | 111 --
.../experimental/ats_pagespeed/gzip/debug_macros.h | 64 -
plugins/experimental/ats_pagespeed/gzip/gzip.cc | 805 ------------
.../experimental/ats_pagespeed/gzip/gzip.config | 6 -
plugins/experimental/ats_pagespeed/gzip/misc.cc | 197 ---
plugins/experimental/ats_pagespeed/gzip/misc.h | 75 --
.../ats_pagespeed/scripts/prepare_psol.sh | 93 --
.../ssl_cert_loader/ssl-cert-loader.cc | 12 -
.../gzip/Makefile => tls_bridge/Makefile.inc} | 13 +-
plugins/experimental/tls_bridge/README | 20 +
plugins/experimental/tls_bridge/regex.cc | 126 ++
plugins/experimental/tls_bridge/regex.h | 63 +
plugins/experimental/tls_bridge/tls_bridge.cc | 630 ++++++++++
plugins/experimental/ts_lua/ts_lua_http_config.c | 7 +-
plugins/experimental/url_sig/README | 57 +-
plugins/experimental/url_sig/sign.pl | 167 ++-
plugins/experimental/url_sig/url_sig.c | 261 +++-
plugins/experimental/url_sig/url_sig.h | 1 +
plugins/header_rewrite/conditions.cc | 99 ++
plugins/header_rewrite/conditions.h | 32 +
plugins/header_rewrite/factory.cc | 2 +
proxy/InkAPI.cc | 16 +-
proxy/InkAPITest.cc | 3 +-
proxy/Main.cc | 33 +-
proxy/api/ts/ts.h | 27 +-
proxy/hdrs/URL.cc | 8 +-
proxy/http/HttpConfig.cc | 2 +
proxy/http/HttpConfig.h | 2 +
proxy/http/HttpProxyServerMain.cc | 39 +-
proxy/http/HttpProxyServerMain.h | 17 +-
proxy/http/HttpSM.cc | 49 +-
proxy/http2/Http2ConnectionState.cc | 20 +-
proxy/http2/Http2Stream.cc | 115 +-
proxy/http2/Http2Stream.h | 4 +-
tests/README.md | 1 -
tests/gold_tests/h2/gold/httpbin_1_stderr.gold | 15 +
tests/gold_tests/h2/gold/httpbin_1_stdout.gold | 0
tests/gold_tests/h2/gold/httpbin_2_stderr.gold | 14 +
tests/gold_tests/h2/gold/httpbin_2_stdout.gold | 1 +
tests/gold_tests/h2/gold/httpbin_access.gold | 3 +
tests/gold_tests/h2/httpbin.test.py | 45 +-
128 files changed, 2684 insertions(+), 6859 deletions(-)
diff --cc iocore/net/Makefile.am
index 0bc196f,ae329ab..53d60b3
--- a/iocore/net/Makefile.am
+++ b/iocore/net/Makefile.am
@@@ -159,27 -155,6 +159,22 @@@ libinknet_a_SOURCES =
UnixUDPNet.cc \
SSLDynlock.cc
+if ENABLE_QUIC
+libinknet_a_SOURCES += \
+ P_QUICClosedConCollector.h \
+ P_QUICPacketHandler.h \
+ P_QUICNet.h \
+ P_QUICNetProcessor.h \
+ P_QUICNetVConnection.h \
+ P_QUICNextProtocolAccept.h \
+ QUICClosedConCollector.cc \
+ QUICPacketHandler.cc \
+ QUICNet.cc \
+ QUICNetProcessor.cc \
+ QUICNetVConnection.cc \
+ QUICNextProtocolAccept.cc
+endif
+
- #test_UNUSED_SOURCES = \
- # NetTest-http-server.c \
- # test_I_Net.cc \
- # test_P_Net.cc
-
if BUILD_TESTS
libinknet_a_SOURCES += \
NetVCTest.cc \
diff --cc proxy/Main.cc
index 5614444,53a122a..673b711
--- a/proxy/Main.cc
+++ b/proxy/Main.cc
@@@ -1797,14 -1795,22 +1799,27 @@@ main(int /* argc ATS_UNUSED */, const c
ink_dns_init(makeModuleVersion(HOSTDB_MODULE_MAJOR_VERSION, HOSTDB_MODULE_MINOR_VERSION, PRIVATE_MODULE_HEADER));
ink_split_dns_init(makeModuleVersion(1, 0, PRIVATE_MODULE_HEADER));
+ naVecMutex = new_ProxyMutex();
+ started_et_net_threads = 0;
+
// Do the inits for NetProcessors that use ET_NET threads. MUST be before starting those threads.
netProcessor.init();
- init_HttpProxyServer();
+ prep_HttpProxyServer();
+
+#if TS_USE_QUIC == 1
+ // OK, pushing a spawn scheduling here
+ quic_NetProcessor.init();
+#endif
+
+ if (num_accept_threads == 0) {
+ eventProcessor.schedule_spawn(&init_HttpProxyServer, ET_NET);
+ } else {
+ std::unique_lock<std::mutex> lock(proxyServerMutex);
+ et_net_threads_ready = true;
+ lock.unlock();
+ proxyServerCheck.notify_one();
+ }
+
// !! ET_NET threads start here !!
// This means any spawn scheduling must be done before this point.
eventProcessor.start(num_of_net_threads, stacksize);
diff --cc proxy/http/HttpProxyServerMain.cc
index 4399e8f,e4dce2d..2ec5857
--- a/proxy/http/HttpProxyServerMain.cc
+++ b/proxy/http/HttpProxyServerMain.cc
@@@ -39,10 -39,7 +39,11 @@@
#include "ProtocolProbeSessionAccept.h"
#include "http2/Http2SessionAccept.h"
#include "HttpConnectionCount.h"
+ #include "HttpProxyServerMain.h"
+#if TS_USE_QUIC == 1
+#include "P_QUICNextProtocolAccept.h"
+#include "hq/HQSessionAccept.h"
+#endif
#include <vector>
--
To stop receiving notification emails like this one, please contact
maskit@apache.org.