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 47b1d724279e4453a4a3d7c79c35ad55bcb96ea7 Merge: 98ebf16 20e8332 Author: Leif Hedstrom <[email protected]> AuthorDate: Sun Apr 29 13:17:35 2018 -0600 Merge remote-tracking branch 'origin/master' into quic-latest * origin/master: (76 commits) traffic_layout fix option in verify added Add ssn and txn tests for HTTP2 don't need negative events now API for setting OCSP Callback Removes remnants of streams cache log actual SSL error string on failure opening connection preserve whitespace when reading/writing records.config Renames gzip plugin to compress Updates editorconfig files & normalizes white-space Update traffic_layout runroot commands and switches fixes build on linunx/clang/libc++ combo Remove unused TSEvent parameters from C++ API Continuation class. doc/admin-guide: minor fixes Move inline functions into class Doc: various fixes Doc: Unify ":unit:" to ":units". Fix TSVConnArg error. Adds a basic .editconfig, should follow clang-format rules Updated to new version of clang-format Cleans up some pylint issues in the python code Correct parameter for certificate verification ... Conflicts: iocore/net/I_NetProcessor.h iocore/net/P_UnixNetVConnection.h lib/ts/ink_endian.h mgmt/RecordsConfig.cc proxy/Makefile.am proxy/http/Makefile.am .clang-format | 44 ++- .editorconfig | 44 +++ CMakeLists.txt | 9 +- Makefile.am | 2 +- README | 4 +- STATUS | 9 +- build/tidy.mk | 2 +- ci/jenkins/bin/clang-analyzer.sh | 4 +- cmd/Makefile.am | 16 +- cmd/traffic_cache_tool/CacheDefs.cc | 62 ++-- cmd/traffic_cache_tool/CacheDefs.h | 17 +- cmd/traffic_cache_tool/CacheStore.h | 7 +- cmd/traffic_cache_tool/CacheTool.cc | 127 ++++--- cmd/traffic_cache_tool/Command.cc | 24 +- cmd/traffic_cache_tool/Command.h | 6 +- cmd/traffic_cache_tool/File.cc | 20 +- cmd/traffic_cache_tool/File.h | 38 +- cmd/traffic_cache_tool/Makefile.am | 7 + cmd/traffic_cop/Makefile.am | 26 +- cmd/traffic_cop/traffic_cop.cc | 10 +- cmd/traffic_crashlog/Makefile.am | 38 +- cmd/traffic_crashlog/traffic_crashlog.h | 5 +- cmd/traffic_ctl/Makefile.am | 44 +-- cmd/traffic_ctl/traffic_ctl.h | 5 +- cmd/traffic_layout/Makefile.am | 42 +-- cmd/traffic_layout/engine.cc | 338 ++++++++++++------ cmd/traffic_layout/engine.h | 11 +- cmd/traffic_layout/file_system.cc | 42 ++- cmd/traffic_layout/file_system.h | 3 - cmd/traffic_layout/info.cc | 5 +- cmd/traffic_layout/traffic_layout.cc | 18 +- cmd/traffic_manager/Makefile.am | 94 ++--- cmd/traffic_manager/MgmtHandlers.h | 5 +- cmd/traffic_manager/metrics.h | 5 +- cmd/traffic_top/Makefile.am | 40 +-- cmd/traffic_top/stats.h | 43 ++- cmd/traffic_top/traffic_top.cc | 2 +- cmd/traffic_via/Makefile.am | 20 +- cmd/traffic_via/traffic_via.cc | 3 +- cmd/traffic_wccp/Makefile.am | 28 +- configure.ac | 6 +- doc/Makefile.am | 8 +- doc/admin-guide/files/hosting.config.en.rst | 12 +- doc/admin-guide/files/index.en.rst | 2 +- doc/admin-guide/files/ip_allow.config.en.rst | 129 ++++--- doc/admin-guide/files/records.config.en.rst | 19 +- .../files/ssl_server_name.config.en.rst | 8 +- doc/admin-guide/files/volume.config.en.rst | 25 +- doc/admin-guide/logging/cache-results.en.rst | 21 +- doc/admin-guide/logging/formatting.en.rst | 3 + .../monitoring/statistics/core/bandwidth.en.rst | 32 +- .../monitoring/statistics/core/cache-volume.en.rst | 12 +- .../monitoring/statistics/core/dns.en.rst | 8 +- .../monitoring/statistics/core/general.en.rst | 6 +- .../monitoring/statistics/core/hierarchical.en.rst | 10 +- .../monitoring/statistics/core/hostdb.en.rst | 14 +- .../statistics/core/http-connection.en.rst | 20 +- .../statistics/core/http-document-size.en.rst | 2 +- .../statistics/core/http-transaction.en.rst | 56 +-- .../monitoring/statistics/core/log.en.rst | 38 +- .../monitoring/statistics/core/misc.en.rst | 4 +- .../monitoring/statistics/core/network-io.en.rst | 4 +- .../monitoring/statistics/core/origin.en.rst | 30 +- .../monitoring/statistics/core/ssl.en.rst | 2 +- .../plugins/{gzip.en.rst => compress.en.rst} | 35 +- doc/admin-guide/plugins/index.en.rst | 2 +- doc/admin-guide/plugins/tcpinfo.en.rst | 28 +- doc/admin-guide/plugins/ts_lua.en.rst | 43 +++ doc/admin-guide/storage/index.en.rst | 64 +--- doc/appendices/command-line/traffic_layout.en.rst | 84 +++-- .../api/functions/TSHttpTxnOutgoingAddrGet.en.rst | 31 +- ...SslContextFindBy.en.rst => TSSslContext.en.rst} | 7 +- .../api/functions/TSSslServerContextCreate.en.rst | 6 +- doc/developer-guide/api/functions/TSTypes.en.rst | 4 + .../api/functions/TSVConnArgs.en.rst | 2 +- .../cache-architecture/data-structures.en.rst | 4 - .../internal-libraries/MemArena.en.rst | 236 +++++++++++++ .../internal-libraries/index.en.rst | 1 + doc/ext/traffic-server.py | 4 +- doc/preface/index.en.rst | 7 +- doc/uml/Makefile.am | 12 +- example/Makefile.am | 2 +- example/cache_scan/cache_scan.cc | 9 +- .../AsyncHttpFetchStreaming.cc | 6 +- example/cppapi/boom/boom.cc | 2 +- example/cppapi/clientrequest/ClientRequest.cc | 5 +- .../DelayTransformationPlugin.cc | 2 +- .../InternalTransactionHandling.cc | 2 +- example/cppapi/logger_example/LoggerExample.cc | 13 +- .../NullTransformationPlugin.cc | 2 +- example/cppapi/serverresponse/ServerResponse.cc | 9 +- example/cppapi/stat_example/StatExample.cc | 2 +- example/cppapi/websocket/WSBuffer.cc | 4 +- example/cppapi/websocket/WSBuffer.h | 4 - example/cppapi/websocket/WebSocket.h | 5 +- example/response_header_1/response_header_1.c | 22 +- example/ssl_preaccept/ssl_preaccept.cc | 5 +- example/ssl_sni/ssl_sni.cc | 5 +- example/ssl_sni_whitelist/ssl_sni_whitelist.cc | 5 +- example/thread_pool/include/Makefile.am | 2 +- example/thread_pool/psi.c | 2 +- example/thread_pool/thread.c | 3 +- example/thread_pool/thread.h | 7 +- example/verify_cert/verify_cert.cc | 9 +- iocore/Makefile.am | 5 - iocore/aio/I_AIO.h | 4 +- iocore/aio/Makefile.am | 56 +-- iocore/aio/P_AIO.h | 8 +- iocore/cache/Cache.cc | 68 +--- iocore/cache/CacheDir.cc | 10 +- iocore/cache/CacheHosting.cc | 21 +- iocore/cache/CacheHttp.cc | 4 +- iocore/cache/CachePages.cc | 2 +- iocore/cache/CachePagesInternal.cc | 2 +- iocore/cache/CacheRead.cc | 11 +- iocore/cache/CacheTest.cc | 5 +- iocore/cache/CacheVol.cc | 14 +- iocore/cache/CacheWrite.cc | 26 +- iocore/cache/I_Cache.h | 33 +- iocore/cache/I_CacheDefs.h | 4 +- iocore/cache/I_Store.h | 22 +- iocore/cache/Makefile.am | 82 ++--- iocore/cache/P_Cache.h | 4 +- iocore/cache/P_CacheArray.h | 8 +- iocore/cache/P_CacheBC.h | 5 +- iocore/cache/P_CacheDir.h | 29 +- iocore/cache/P_CacheDisk.h | 5 +- iocore/cache/P_CacheHosting.h | 13 +- iocore/cache/P_CacheHttp.h | 5 +- iocore/cache/P_CacheInternal.h | 139 +++++--- iocore/cache/P_CacheTest.h | 7 +- iocore/cache/P_CacheVol.h | 70 ++-- iocore/cache/P_RamCache.h | 11 +- iocore/cache/RamCacheCLFUS.cc | 4 +- iocore/cache/RamCacheLRU.cc | 10 +- iocore/cache/Store.cc | 4 +- iocore/dns/DNS.cc | 23 +- iocore/dns/DNSConnection.cc | 11 +- iocore/dns/I_DNS.h | 5 +- iocore/dns/I_DNSProcessor.h | 19 +- iocore/dns/I_SplitDNS.h | 5 +- iocore/dns/I_SplitDNSProcessor.h | 5 +- iocore/dns/Makefile.am | 48 +-- iocore/dns/P_DNS.h | 5 +- iocore/dns/P_DNSConnection.h | 12 +- iocore/dns/P_DNSProcessor.h | 13 +- iocore/dns/P_SplitDNS.h | 5 +- iocore/dns/P_SplitDNSProcessor.h | 17 +- iocore/dns/SRV.h | 5 +- iocore/dns/SplitDNS.cc | 4 +- iocore/dns/test_P_DNS.cc | 4 +- iocore/eventsystem/I_Action.h | 18 +- iocore/eventsystem/I_Continuation.h | 5 +- iocore/eventsystem/I_EThread.h | 6 +- iocore/eventsystem/I_Event.h | 11 +- iocore/eventsystem/I_EventProcessor.h | 9 +- iocore/eventsystem/I_EventSystem.h | 4 +- iocore/eventsystem/I_IOBuffer.h | 22 +- iocore/eventsystem/I_Lock.h | 22 +- iocore/eventsystem/I_MIOBufferWriter.h | 7 +- iocore/eventsystem/I_PriorityEventQueue.h | 8 +- iocore/eventsystem/I_Processor.h | 5 +- iocore/eventsystem/I_ProtectedQueue.h | 5 +- iocore/eventsystem/I_ProxyAllocator.h | 7 +- iocore/eventsystem/I_SocketManager.h | 5 +- iocore/eventsystem/I_Tasks.h | 5 +- iocore/eventsystem/I_Thread.h | 5 +- iocore/eventsystem/I_VConnection.h | 10 +- iocore/eventsystem/I_VIO.h | 3 +- iocore/eventsystem/Makefile.am | 138 ++++---- iocore/eventsystem/P_EventSystem.h | 4 +- iocore/eventsystem/P_Freer.h | 8 +- iocore/eventsystem/P_IOBuffer.h | 149 ++++---- iocore/eventsystem/P_ProtectedQueue.h | 8 +- iocore/eventsystem/P_Thread.h | 5 +- iocore/eventsystem/P_UnixEThread.h | 13 +- iocore/eventsystem/P_UnixEvent.h | 5 +- iocore/eventsystem/P_UnixEventProcessor.h | 23 +- iocore/eventsystem/P_UnixSocketManager.h | 95 +++-- iocore/eventsystem/P_VConnection.h | 15 +- iocore/eventsystem/P_VIO.h | 27 +- iocore/eventsystem/Processor.cc | 8 +- iocore/eventsystem/SocketManager.cc | 4 +- iocore/eventsystem/UnixEThread.cc | 14 +- iocore/eventsystem/UnixEventProcessor.cc | 8 +- iocore/hostdb/HostDB.cc | 11 +- iocore/hostdb/I_HostDB.h | 5 +- iocore/hostdb/I_HostDBProcessor.h | 18 +- iocore/hostdb/Makefile.am | 74 ++-- iocore/hostdb/P_HostDB.h | 4 +- iocore/hostdb/P_HostDBProcessor.h | 9 +- iocore/hostdb/P_RefCountCache.h | 5 +- iocore/hostdb/P_RefCountCacheSerializer.h | 7 +- iocore/hostdb/test_P_HostDB.cc | 4 +- iocore/net/BIO_fastopen.h | 5 +- iocore/net/I_Net.h | 4 +- iocore/net/I_NetProcessor.h | 6 +- iocore/net/I_NetVConnection.h | 11 +- iocore/net/I_SessionAccept.h | 7 +- iocore/net/I_Socks.h | 7 +- iocore/net/I_UDPConnection.h | 4 +- iocore/net/I_UDPNet.h | 5 +- iocore/net/I_UDPPacket.h | 4 +- iocore/net/LuaSNIConfig.cc | 10 +- iocore/net/Makefile.am | 246 ++++++------- iocore/net/NetVCTest.cc | 8 +- iocore/net/P_CompletionUtil.h | 5 +- iocore/net/P_Connection.h | 11 +- iocore/net/P_Net.h | 5 +- iocore/net/P_NetAccept.h | 5 +- iocore/net/P_NetVCTest.h | 5 +- iocore/net/P_NetVConnection.h | 2 +- iocore/net/P_OCSPStapling.h | 5 +- iocore/net/P_SNIActionPerformer.h | 5 +- iocore/net/P_SSLCertLookup.h | 6 +- iocore/net/P_SSLClientUtils.h | 5 +- iocore/net/P_SSLConfig.h | 5 +- iocore/net/P_SSLNetAccept.h | 4 +- iocore/net/P_SSLNetVConnection.h | 5 +- iocore/net/P_SSLNextProtocolAccept.h | 5 +- iocore/net/P_SSLNextProtocolSet.h | 5 +- iocore/net/P_SSLSNI.h | 5 +- iocore/net/P_SSLUtils.h | 10 +- iocore/net/P_Socks.h | 7 +- iocore/net/P_UDPConnection.h | 5 +- iocore/net/P_UDPIOEvent.h | 6 +- iocore/net/P_UDPNet.h | 5 +- iocore/net/P_UDPPacket.h | 5 +- iocore/net/P_UnixCompletionUtil.h | 4 +- iocore/net/P_UnixNet.h | 5 +- iocore/net/P_UnixNetProcessor.h | 4 +- iocore/net/P_UnixNetState.h | 5 +- iocore/net/P_UnixNetVConnection.h | 11 +- iocore/net/P_UnixPollDescriptor.h | 7 +- iocore/net/P_UnixUDPConnection.h | 7 +- iocore/net/SNIActionPerformer.cc | 7 +- iocore/net/SSLCertLookup.cc | 8 +- iocore/net/SSLClientUtils.cc | 4 +- iocore/net/SSLConfig.cc | 3 +- iocore/net/SSLDynlock.h | 5 +- iocore/net/SSLNetAccept.cc | 8 +- iocore/net/SSLNetProcessor.cc | 4 +- iocore/net/SSLNetVConnection.cc | 44 ++- iocore/net/SSLNextProtocolSet.cc | 8 +- iocore/net/SSLSNIConfig.cc | 25 +- iocore/net/SSLSessionCache.cc | 14 +- iocore/net/SSLSessionCache.h | 5 +- iocore/net/SSLUtils.cc | 37 +- iocore/net/Socks.cc | 17 +- iocore/net/UnixConnection.cc | 2 +- iocore/net/UnixNet.cc | 26 +- iocore/net/UnixNetAccept.cc | 6 +- iocore/net/UnixNetProcessor.cc | 9 +- iocore/net/UnixNetVConnection.cc | 4 +- iocore/net/UnixUDPNet.cc | 12 +- iocore/net/test_I_Net.cc | 6 +- iocore/utils/I_Machine.h | 6 +- iocore/utils/I_OneWayMultiTunnel.h | 4 +- iocore/utils/I_OneWayTunnel.h | 5 +- iocore/utils/Machine.cc | 2 +- iocore/utils/Makefile.am | 22 +- iocore/utils/OneWayMultiTunnel.cc | 2 +- iocore/utils/OneWayTunnel.cc | 8 +- iocore/utils/diags.i | 14 +- lib/bindings/Makefile.am | 26 +- lib/bindings/bindings.cc | 4 +- lib/bindings/bindings.h | 5 +- lib/bindings/lua.h | 5 +- lib/bindings/metrics.cc | 5 +- lib/bindings/metrics.h | 5 +- lib/bindings/repl.h | 5 +- lib/cppapi/AsyncHttpFetch.cc | 8 +- lib/cppapi/AsyncTimer.cc | 2 +- .../ink_stack_trace.h => cppapi/Continuation.cc} | 36 +- lib/cppapi/GzipDeflateTransformation.cc | 2 +- lib/cppapi/GzipInflateTransformation.cc | 2 +- lib/cppapi/Headers.cc | 26 +- lib/cppapi/InterceptPlugin.cc | 6 +- lib/cppapi/Logger.cc | 2 +- lib/cppapi/Makefile.am | 4 +- lib/cppapi/Response.cc | 2 +- lib/cppapi/include/atscppapi/AsyncHttpFetch.h | 6 +- lib/cppapi/include/atscppapi/AsyncTimer.h | 6 +- .../atscppapi/CaseInsensitiveStringComparator.h | 6 +- lib/cppapi/include/atscppapi/ClientRequest.h | 6 +- lib/cppapi/include/atscppapi/Continuation.h | 145 ++++++++ lib/cppapi/include/atscppapi/GlobalPlugin.h | 6 +- .../include/atscppapi/GzipDeflateTransformation.h | 4 +- .../include/atscppapi/GzipInflateTransformation.h | 4 +- lib/cppapi/include/atscppapi/Headers.h | 334 +++++++++--------- lib/cppapi/include/atscppapi/HttpMethod.h | 6 +- lib/cppapi/include/atscppapi/HttpStatus.h | 6 +- lib/cppapi/include/atscppapi/HttpVersion.h | 6 +- lib/cppapi/include/atscppapi/InterceptPlugin.h | 6 +- lib/cppapi/include/atscppapi/Logger.h | 6 +- lib/cppapi/include/atscppapi/Plugin.h | 16 +- lib/cppapi/include/atscppapi/PluginInit.h | 4 - lib/cppapi/include/atscppapi/RemapPlugin.h | 6 +- lib/cppapi/include/atscppapi/Request.h | 6 +- lib/cppapi/include/atscppapi/Response.h | 6 +- lib/cppapi/include/atscppapi/Stat.h | 6 +- lib/cppapi/include/atscppapi/Transaction.h | 6 +- lib/cppapi/include/atscppapi/TransactionPlugin.h | 2 +- .../include/atscppapi/TransformationPlugin.h | 16 +- lib/cppapi/include/atscppapi/Url.h | 6 +- lib/cppapi/include/atscppapi/noncopyable.h | 6 +- lib/cppapi/include/atscppapi/utils.h | 8 +- lib/cppapi/include/logging_internal.h | 4 - lib/cppapi/include/utils_internal.h | 8 +- lib/raft/raft.h | 14 +- lib/raft/raft_impl.h | 4 +- lib/records/I_RecAlarms.h | 5 +- lib/records/I_RecCore.h | 5 +- lib/records/I_RecDefs.h | 9 +- lib/records/I_RecEvents.h | 5 +- lib/records/I_RecHttp.h | 27 +- lib/records/I_RecLocal.h | 5 +- lib/records/I_RecMutex.h | 5 +- lib/records/I_RecProcess.h | 5 +- lib/records/I_RecSignals.h | 5 +- lib/records/Makefile.am | 84 ++--- lib/records/P_RecCore.h | 5 +- lib/records/P_RecDefs.h | 5 +- lib/records/P_RecFile.h | 5 +- lib/records/P_RecLocal.h | 5 +- lib/records/P_RecMessage.h | 5 +- lib/records/P_RecProcess.h | 5 +- lib/records/P_RecUtils.h | 5 +- lib/records/RecConfigParse.cc | 2 +- lib/records/RecHttp.cc | 9 +- lib/records/RecRawStats.cc | 2 +- lib/ts/Allocator.h | 5 +- lib/ts/Arena.h | 5 +- lib/ts/BaseLogFile.h | 9 +- lib/ts/Bitops.h | 5 +- lib/ts/BufferWriter.h | 27 +- lib/ts/BufferWriterFormat.cc | 165 +++++---- lib/ts/BufferWriterForward.h | 4 +- lib/ts/ConsistentHash.cc | 4 +- lib/ts/ConsistentHash.h | 12 +- lib/ts/ContFlags.h | 5 +- lib/ts/CryptoHash.h | 9 +- lib/ts/Diags.cc | 7 +- lib/ts/Diags.h | 4 +- lib/ts/DynArray.h | 11 +- lib/ts/EventNotify.h | 5 +- lib/ts/Hash.cc | 4 +- lib/ts/Hash.h | 9 +- lib/ts/HashFNV.h | 5 +- lib/ts/HashMD5.h | 5 +- lib/ts/HashSip.h | 5 +- lib/ts/History.h | 5 +- lib/ts/HostLookup.cc | 8 +- lib/ts/HostLookup.h | 9 +- lib/ts/INK_MD5.h | 5 +- lib/ts/I_Layout.h | 5 +- lib/ts/I_Version.h | 5 +- lib/ts/InkErrno.h | 5 +- lib/ts/IntrusiveDList.h | 47 +-- lib/ts/IntrusivePtrTest.cc | 2 +- lib/ts/IpMap.cc | 55 +-- lib/ts/IpMap.h | 72 ++-- lib/ts/IpMapConf.h | 2 + lib/ts/JeAllocator.cc | 2 +- lib/ts/JeAllocator.h | 5 +- lib/ts/Layout.cc | 4 +- lib/ts/List.h | 19 +- lib/ts/MMH.cc | 2 +- lib/ts/MMH.h | 5 +- lib/ts/MT_hashtable.h | 77 +++-- lib/ts/Makefile.am | 351 +++++++++---------- lib/ts/Map.h | 78 +++-- lib/ts/MatcherUtils.h | 13 +- lib/ts/MemArena.cc | 208 +++++++++++ lib/ts/MemArena.h | 153 +++++++++ lib/ts/MemSpan.h | 43 +-- lib/ts/ParseRules.h | 13 +- lib/ts/PriorityQueue.h | 15 +- lib/ts/Ptr.h | 11 +- lib/ts/RawHashTable.h | 19 +- lib/ts/RbTree.cc | 6 +- lib/ts/RbTree.h | 19 +- lib/ts/Regex.h | 9 +- lib/ts/Regression.h | 5 +- lib/ts/Result.h | 5 +- lib/ts/SHA256.h | 5 +- lib/ts/Scalar.h | 36 +- lib/ts/SimpleTokenizer.h | 11 +- lib/ts/SourceLocation.h | 5 +- lib/ts/TestBox.h | 8 +- lib/ts/TextBuffer.h | 5 +- lib/ts/TextView.cc | 4 +- lib/ts/TextView.h | 79 ++--- lib/ts/Tokenizer.h | 5 +- lib/ts/Trie.h | 10 +- lib/ts/TsBuffer.h | 69 ++-- lib/ts/X509HostnameValidator.h | 5 +- lib/ts/apidefs.h.in | 6 +- lib/ts/defalloc.h | 5 +- lib/ts/fastlz.c | 12 +- lib/ts/fastlz.h | 5 +- lib/ts/hugepages.h | 5 +- lib/ts/ink_aiocb.h | 5 +- lib/ts/ink_align.h | 5 +- lib/ts/ink_apidefs.h | 5 +- lib/ts/ink_args.h | 13 +- lib/ts/ink_assert.h | 5 +- lib/ts/ink_atomic.h | 5 +- lib/ts/ink_base64.h | 5 +- lib/ts/ink_cap.h | 9 +- lib/ts/ink_code.h | 4 +- lib/ts/ink_defs.h | 9 +- lib/ts/ink_endian.h | 31 +- lib/ts/ink_error.h | 5 +- lib/ts/ink_exception.h | 2 + lib/ts/ink_file.cc | 4 +- lib/ts/ink_file.h | 5 +- lib/ts/ink_hash_table.h | 4 +- lib/ts/ink_hrtime.cc | 4 +- lib/ts/ink_hrtime.h | 5 +- lib/ts/ink_inet.cc | 96 +++++- lib/ts/ink_inet.h | 107 +++--- lib/ts/ink_inout.h | 5 +- lib/ts/ink_llqueue.h | 5 +- lib/ts/ink_lockfile.h | 5 +- lib/ts/ink_memory.h | 15 +- lib/ts/ink_mutex.h | 5 +- lib/ts/ink_platform.h | 22 +- lib/ts/ink_queue.cc | 18 +- lib/ts/ink_queue.h | 5 +- lib/ts/ink_rand.h | 5 +- lib/ts/ink_res_init.cc | 6 +- lib/ts/ink_resolver.h | 13 +- lib/ts/ink_resource.h | 5 +- lib/ts/ink_rwlock.h | 5 +- lib/ts/ink_sock.h | 5 +- lib/ts/ink_sprintf.h | 5 +- lib/ts/ink_stack_trace.h | 5 +- lib/ts/ink_string++.h | 46 ++- lib/ts/ink_string.h | 5 +- lib/ts/ink_sys_control.h | 5 +- lib/ts/ink_syslog.h | 5 +- lib/ts/ink_thread.h | 5 +- lib/ts/ink_time.h | 5 +- lib/ts/ink_uuid.h | 4 +- lib/ts/llqueue.cc | 2 +- lib/ts/mkdfa.c | 8 +- lib/ts/runroot.cc | 23 +- lib/ts/signals.h | 5 +- lib/ts/string_view.h | 196 +---------- lib/ts/test_Map.cc | 4 +- lib/ts/test_PriorityQueue.cc | 4 +- lib/ts/unit-tests/test_BufferWriterFormat.cc | 27 ++ lib/ts/unit-tests/test_IpMap.cc | 5 +- lib/ts/unit-tests/test_MemArena.cc | 210 ++++++++++++ lib/ts/unit-tests/test_ink_inet.cc | 64 ++++ lib/ts/unit-tests/test_string_view.cc | 2 +- lib/tsconfig/Errata.cc | 6 +- lib/tsconfig/IntrusivePtr.h | 12 +- lib/tsconfig/Makefile.am | 44 +-- lib/tsconfig/TsBuilder.h | 2 +- lib/tsconfig/TsConfigGrammar.h | 5 +- lib/tsconfig/TsValue.h | 8 +- lib/wccp/Makefile.am | 26 +- lib/wccp/Wccp.h | 44 +-- lib/wccp/WccpConfig.cc | 8 +- lib/wccp/WccpEndPoint.cc | 45 +-- lib/wccp/WccpLocal.h | 381 +++++++++------------ lib/wccp/WccpMeta.h | 11 +- lib/wccp/WccpMsg.cc | 14 +- lib/wccp/WccpUtil.h | 27 +- mgmt/Alarms.h | 6 +- mgmt/BaseManager.h | 2 +- mgmt/FileManager.h | 7 +- mgmt/LocalManager.cc | 9 +- mgmt/LocalManager.h | 4 +- mgmt/Makefile.am | 72 ++-- mgmt/ProxyConfig.h | 2 +- mgmt/RecordsConfig.cc | 6 +- mgmt/RecordsConfig.h | 5 +- mgmt/Rollback.h | 10 +- mgmt/WebMgmtUtils.cc | 12 +- mgmt/api/CoreAPI.cc | 20 +- mgmt/api/CoreAPI.h | 9 +- mgmt/api/CoreAPIShared.h | 5 +- mgmt/api/EventCallback.h | 5 +- mgmt/api/EventControlMain.h | 5 +- mgmt/api/GenericParser.cc | 8 +- mgmt/api/GenericParser.h | 5 +- mgmt/api/Makefile.am | 80 ++--- mgmt/api/NetworkMessage.cc | 3 +- mgmt/api/NetworkMessage.h | 5 +- mgmt/api/NetworkUtilsLocal.h | 5 +- mgmt/api/NetworkUtilsRemote.h | 5 +- mgmt/api/include/Makefile.am | 2 +- mgmt/api/include/mgmtapi.h | 5 +- mgmt/utils/ExpandingArray.h | 5 +- mgmt/utils/Makefile.am | 54 +-- mgmt/utils/MgmtHashTable.h | 5 +- mgmt/utils/MgmtMarshall.h | 5 +- mgmt/utils/MgmtSocket.h | 5 +- mgmt/utils/MgmtUtils.h | 2 +- plugins/Makefile.am | 4 +- plugins/authproxy/authproxy.cc | 2 +- plugins/background_fetch/configs.h | 7 +- plugins/background_fetch/headers.h | 5 +- plugins/background_fetch/rules.h | 7 +- plugins/{gzip => compress}/Makefile.inc | 8 +- plugins/{gzip => compress}/README | 26 +- plugins/{gzip/gzip.cc => compress/compress.cc} | 58 ++-- plugins/{gzip => compress}/configuration.cc | 27 +- plugins/{gzip => compress}/configuration.h | 16 +- plugins/{gzip => compress}/debug_macros.h | 4 +- plugins/{gzip => compress}/misc.cc | 6 +- plugins/{gzip => compress}/misc.h | 9 +- .../sample.compress.config} | 15 +- plugins/esi/combo_handler.cc | 3 +- plugins/esi/esi.cc | 22 +- plugins/esi/fetcher/HttpDataFetcher.h | 6 +- plugins/esi/fetcher/HttpDataFetcherImpl.h | 10 +- plugins/esi/lib/Attribute.h | 4 +- plugins/esi/lib/ComponentBase.h | 2 +- plugins/esi/lib/DocNode.h | 4 +- plugins/esi/lib/EsiParser.cc | 4 +- plugins/esi/lib/EsiParser.h | 4 +- plugins/esi/lib/EsiProcessor.cc | 10 +- plugins/esi/lib/EsiProcessor.h | 4 +- plugins/esi/lib/Expression.h | 4 +- plugins/esi/lib/HandlerManager.h | 4 +- plugins/esi/lib/HttpHeader.h | 4 +- plugins/esi/lib/SpecialIncludeHandler.h | 4 +- plugins/esi/lib/Stats.cc | 4 +- plugins/esi/lib/Stats.h | 4 +- plugins/esi/lib/StringHash.h | 2 +- plugins/esi/lib/Utils.h | 6 +- plugins/esi/lib/Variables.h | 6 +- plugins/esi/lib/gzip.h | 4 +- plugins/esi/test/TestHandlerManager.cc | 4 +- plugins/esi/test/TestHttpDataFetcher.h | 2 +- plugins/esi/test/processor_test.cc | 42 ++- plugins/esi/test/sampleProb.cc | 6 +- plugins/esi/test/vars_test.cc | 5 +- plugins/experimental/acme/acme.c | 5 +- plugins/experimental/balancer/balancer.cc | 3 +- plugins/experimental/balancer/balancer.h | 7 +- .../experimental/buffer_upload/buffer_upload.cc | 5 +- .../cache_range_requests/cache_range_requests.cc | 14 +- plugins/experimental/cachekey/cachekey.h | 5 +- plugins/experimental/cachekey/common.h | 5 +- plugins/experimental/cachekey/configs.h | 5 +- plugins/experimental/cachekey/pattern.cc | 4 +- plugins/experimental/cachekey/pattern.h | 5 +- .../collapsed_connection/MurmurHash3.cc | 32 +- .../collapsed_connection/P_collapsed_connection.h | 5 +- .../custom_redirect/custom_redirect.cc | 2 +- plugins/experimental/geoip_acl/acl.h | 10 +- plugins/experimental/geoip_acl/lulu.h | 5 +- plugins/experimental/inliner/cache-handler.h | 40 +-- plugins/experimental/inliner/cache.cc | 4 +- plugins/experimental/inliner/cache.h | 22 +- plugins/experimental/inliner/fetcher.cc | 2 +- plugins/experimental/inliner/fetcher.h | 76 ++-- plugins/experimental/inliner/gif.h | 4 +- plugins/experimental/inliner/html-parser.cc | 4 +- plugins/experimental/inliner/html-parser.h | 6 +- plugins/experimental/inliner/inliner-handler.cc | 4 +- plugins/experimental/inliner/inliner-handler.h | 6 +- plugins/experimental/inliner/jpeg.h | 4 +- plugins/experimental/inliner/png.h | 4 +- plugins/experimental/inliner/ts.cc | 4 +- plugins/experimental/inliner/ts.h | 42 +-- plugins/experimental/inliner/util.h | 2 +- plugins/experimental/inliner/vconnection.h | 20 +- plugins/experimental/memcache/tsmemcache.h | 3 +- plugins/experimental/money_trace/money_trace.cc | 8 +- plugins/experimental/money_trace/money_trace.h | 2 +- plugins/experimental/mp4/mp4_common.h | 10 +- plugins/experimental/mp4/mp4_meta.h | 10 +- plugins/experimental/multiplexer/README | 2 +- plugins/experimental/multiplexer/dispatch.cc | 2 +- plugins/experimental/multiplexer/fetcher.cc | 2 +- plugins/experimental/multiplexer/fetcher.h | 26 +- .../experimental/multiplexer/original-request.cc | 2 - plugins/experimental/multiplexer/ts.cc | 4 +- plugins/experimental/multiplexer/ts.h | 12 +- plugins/experimental/mysql_remap/default.h | 5 +- plugins/experimental/mysql_remap/lib/dictionary.h | 5 +- plugins/experimental/mysql_remap/lib/iniparser.h | 5 +- .../server_push_preload/server_push_preload.cc | 4 +- plugins/experimental/ssl_cert_loader/ats-util.h | 7 +- plugins/experimental/ssl_cert_loader/domain-tree.h | 4 +- .../ssl_cert_loader/ssl-cert-loader.cc | 5 +- plugins/experimental/sslheaders/sslheaders.cc | 3 +- .../experimental/stream_editor/stream_editor.cc | 2 +- plugins/experimental/tls_bridge/regex.cc | 12 +- plugins/experimental/tls_bridge/regex.h | 5 +- plugins/experimental/tls_bridge/tls_bridge.cc | 23 +- plugins/experimental/ts_lua/ts_lua.c | 6 +- plugins/experimental/ts_lua/ts_lua_http.c | 5 +- plugins/experimental/ts_lua/ts_lua_http_config.c | 6 +- .../experimental/ts_lua/ts_lua_server_request.c | 91 +++++ plugins/experimental/ts_lua/ts_lua_stat.c | 9 +- plugins/experimental/url_sig/url_sig.c | 3 +- plugins/experimental/url_sig/url_sig.h | 5 +- plugins/header_rewrite/condition.h | 7 +- plugins/header_rewrite/conditions.cc | 3 +- plugins/header_rewrite/conditions.h | 7 +- plugins/header_rewrite/expander.h | 5 +- plugins/header_rewrite/factory.h | 5 +- plugins/header_rewrite/lulu.h | 5 +- plugins/header_rewrite/matcher.h | 9 +- plugins/header_rewrite/operator.h | 7 +- plugins/header_rewrite/operators.h | 9 +- plugins/header_rewrite/parser.h | 5 +- plugins/header_rewrite/regex_helper.h | 7 +- plugins/header_rewrite/resources.h | 25 +- plugins/header_rewrite/ruleset.h | 17 +- plugins/header_rewrite/statement.h | 9 +- plugins/header_rewrite/value.h | 11 +- plugins/healthchecks/healthchecks.c | 5 +- plugins/s3_auth/aws_auth_v4.cc | 28 +- plugins/s3_auth/aws_auth_v4.h | 4 +- plugins/s3_auth/aws_auth_v4_wrap.h | 11 +- plugins/s3_auth/unit-tests/test_aws_auth_v4.h | 11 +- plugins/tcpinfo/tcpinfo.cc | 5 +- plugins/test_cppapi/Makefile.inc | 1 + plugins/test_cppapi/test_cppapi.cc | 135 ++++++-- proxy/CacheControl.h | 7 +- proxy/CompletionUtil.h | 5 +- proxy/ControlBase.cc | 27 +- proxy/ControlBase.h | 9 +- proxy/ControlMatcher.h | 17 +- proxy/CoreUtils.h | 117 +++---- proxy/EventName.h | 7 +- proxy/FetchSM.h | 5 +- proxy/HostStatus.h | 5 +- proxy/IPAllow.cc | 22 +- proxy/IPAllow.h | 5 +- proxy/InkAPI.cc | 36 +- proxy/InkAPIInternal.h | 21 +- proxy/InkAPITest.cc | 5 +- proxy/InkAPITestTool.cc | 45 +-- proxy/Main.cc | 122 ++++--- proxy/Main.h | 5 +- proxy/Makefile.am | 374 ++++++++++---------- proxy/Milestones.h | 5 +- proxy/ParentConsistentHash.h | 5 +- proxy/ParentRoundRobin.cc | 4 +- proxy/ParentRoundRobin.h | 5 +- proxy/ParentSelection.cc | 21 +- proxy/ParentSelection.h | 17 +- proxy/Plugin.h | 7 +- proxy/PluginVC.cc | 8 +- proxy/PluginVC.h | 36 +- proxy/Prefetch.cc | 53 +-- proxy/Prefetch.h | 5 +- proxy/ProtocolProbeSessionAccept.h | 7 +- proxy/ProxyClientSession.h | 34 +- proxy/ProxyClientTransaction.h | 41 ++- proxy/RegressionSM.h | 7 +- proxy/ReverseProxy.h | 5 +- proxy/Show.h | 18 +- proxy/SocksProxy.cc | 2 +- proxy/StatPages.h | 15 +- proxy/TestPreProc.h | 5 +- proxy/TimeTrace.h | 7 +- proxy/Transform.cc | 5 +- proxy/Transform.h | 15 +- proxy/TransformInternal.h | 5 +- proxy/UDPAPIClientTest.h | 1 + proxy/UDPAPITest.h | 1 + proxy/UnixCompletionUtil.h | 4 +- proxy/api/ts/InkAPIPrivateIOCore.h | 5 +- proxy/api/ts/Makefile.am | 8 +- proxy/api/ts/TsException.h | 17 +- proxy/api/ts/experimental.h | 6 +- proxy/api/ts/remap.h | 4 +- proxy/api/ts/ts.h | 13 +- proxy/config/Makefile.am | 38 +- proxy/config/body_factory/default/Makefile.am | 54 +-- proxy/config/ssl_server_name.config.default | 6 +- proxy/congest/Makefile.am | 36 +- proxy/hdrs/HTTP.h | 49 ++- proxy/hdrs/HdrHeap.h | 20 +- proxy/hdrs/HdrTest.cc | 6 +- proxy/hdrs/HdrTest.h | 7 +- proxy/hdrs/HdrToken.cc | 2 +- proxy/hdrs/HdrToken.h | 9 +- proxy/hdrs/HdrUtils.h | 29 +- proxy/hdrs/HttpCompat.cc | 12 +- proxy/hdrs/HttpCompat.h | 5 +- proxy/hdrs/MIME.cc | 8 +- proxy/hdrs/MIME.h | 35 +- proxy/hdrs/Makefile.am | 72 ++-- proxy/hdrs/URL.h | 23 +- proxy/http/Http1ClientSession.cc | 3 +- proxy/http/Http1ClientSession.h | 42 +-- proxy/http/Http1ClientTransaction.cc | 4 +- proxy/http/Http1ClientTransaction.h | 59 +--- proxy/http/HttpBodyFactory.h | 7 +- proxy/http/HttpCacheSM.cc | 19 +- proxy/http/HttpCacheSM.h | 19 +- proxy/http/HttpConfig.h | 28 +- proxy/http/HttpConnectionCount.cc | 3 +- proxy/http/HttpConnectionCount.h | 5 +- proxy/http/HttpDebugNames.cc | 6 +- proxy/http/HttpDebugNames.h | 5 +- proxy/http/HttpPages.cc | 4 +- proxy/http/HttpPages.h | 5 +- proxy/http/HttpProxyAPIEnums.h | 5 +- proxy/http/HttpProxyServerMain.h | 2 + proxy/http/HttpSM.cc | 84 ++--- proxy/http/HttpSM.h | 28 +- proxy/http/HttpServerSession.h | 41 ++- proxy/http/HttpSessionAccept.h | 9 +- proxy/http/HttpSessionManager.cc | 20 +- proxy/http/HttpSessionManager.h | 7 +- proxy/http/HttpTransact.cc | 70 ++-- proxy/http/HttpTransact.h | 6 +- proxy/http/HttpTransactCache.h | 5 +- proxy/http/HttpTransactHeaders.cc | 3 +- proxy/http/HttpTransactHeaders.h | 5 +- proxy/http/HttpTunnel.cc | 20 +- proxy/http/HttpTunnel.h | 55 ++- proxy/http/HttpUpdateSM.cc | 9 +- proxy/http/HttpUpdateSM.h | 5 +- proxy/http/Makefile.am | 116 +++---- proxy/http/remap/AclFiltering.cc | 4 +- proxy/http/remap/AclFiltering.h | 22 +- proxy/http/remap/Makefile.am | 54 +-- proxy/http/remap/RemapConfig.cc | 8 +- proxy/http/remap/RemapConfig.h | 9 +- proxy/http/remap/RemapPluginInfo.h | 9 +- proxy/http/remap/RemapPlugins.h | 9 +- proxy/http/remap/RemapProcessor.cc | 3 +- proxy/http/remap/RemapProcessor.h | 9 +- proxy/http/remap/UrlMapping.cc | 14 +- proxy/http/remap/UrlMapping.h | 35 +- proxy/http/remap/UrlMappingPathIndex.h | 7 +- proxy/http/remap/UrlRewrite.cc | 19 +- proxy/http/remap/UrlRewrite.h | 11 +- proxy/http/unit-tests/test_ForwardedConfig.cc | 2 +- .../http/unit-tests/test_ForwardedConfig_mocks.cc | 6 +- proxy/http2/HPACK.h | 5 +- proxy/http2/HTTP2.h | 7 +- proxy/http2/Http2ClientSession.cc | 4 +- proxy/http2/Http2ClientSession.h | 20 +- proxy/http2/Http2ConnectionState.cc | 10 +- proxy/http2/Http2ConnectionState.h | 5 +- proxy/http2/Http2DebugNames.h | 5 +- proxy/http2/Http2DependencyTree.h | 6 +- proxy/http2/Http2SessionAccept.cc | 8 +- proxy/http2/Http2SessionAccept.h | 5 +- proxy/http2/Http2Stream.cc | 12 +- proxy/http2/Http2Stream.h | 5 +- proxy/http2/HuffmanCodec.h | 5 +- proxy/http2/Makefile.am | 114 +++--- proxy/http2/RegressionHPACK.cc | 177 +++++----- proxy/http2/test_Http2DependencyTree.cc | 60 ++-- proxy/logcat.cc | 5 +- proxy/logging/Log.cc | 9 + proxy/logging/Log.h | 5 +- proxy/logging/LogAccess.cc | 5 + proxy/logging/LogAccess.h | 14 +- proxy/logging/LogAccessHttp.cc | 22 +- proxy/logging/LogAccessHttp.h | 6 +- proxy/logging/LogAccessTest.cc | 8 +- proxy/logging/LogAccessTest.h | 5 +- proxy/logging/LogBindings.cc | 3 +- proxy/logging/LogBindings.h | 5 +- proxy/logging/LogBuffer.h | 10 +- proxy/logging/LogBufferSink.h | 5 +- proxy/logging/LogCollationAccept.cc | 5 +- proxy/logging/LogCollationAccept.h | 5 +- proxy/logging/LogCollationBase.h | 5 +- proxy/logging/LogCollationClientSM.cc | 10 +- proxy/logging/LogCollationClientSM.h | 5 +- proxy/logging/LogCollationHostSM.h | 5 +- proxy/logging/LogConfig.cc | 23 +- proxy/logging/LogConfig.h | 7 +- proxy/logging/LogField.cc | 11 +- proxy/logging/LogField.h | 5 +- proxy/logging/LogFieldAliasMap.h | 16 +- proxy/logging/LogFile.cc | 5 +- proxy/logging/LogFile.h | 5 +- proxy/logging/LogFilter.cc | 8 +- proxy/logging/LogFilter.h | 21 +- proxy/logging/LogFormat.cc | 4 +- proxy/logging/LogFormat.h | 5 +- proxy/logging/LogHost.cc | 4 +- proxy/logging/LogHost.h | 5 +- proxy/logging/LogLimits.h | 5 +- proxy/logging/LogObject.cc | 111 +++--- proxy/logging/LogObject.h | 11 +- proxy/logging/LogSock.cc | 12 +- proxy/logging/LogSock.h | 5 +- proxy/logging/LogUtils.cc | 2 +- proxy/logging/LogUtils.h | 14 +- proxy/logging/Makefile.am | 114 +++--- proxy/logging/test_LogUtils.cc | 20 +- proxy/shared/DiagsConfig.h | 6 +- proxy/shared/Makefile.am | 36 +- proxy/shared/UglyLogStubs.cc | 24 +- rc/Makefile.am | 2 +- tests/bootstrap.py | 2 +- tests/gold_tests/autest-site/.editorconfig | 26 ++ tests/gold_tests/autest-site/cli_tools.test.ext | 55 +++ tests/gold_tests/autest-site/init.cli.ext | 2 +- tests/gold_tests/autest-site/microserver.test.ext | 71 ++-- tests/gold_tests/continuations/double.test.py | 38 +- .../{double.test.py => double_h2.test.py} | 84 +++-- .../openclose.test.py} | 31 +- .../openclose_h2.test.py} | 84 +++-- tests/gold_tests/continuations/ssl/server.key | 15 + tests/gold_tests/continuations/ssl/server.pem | 32 ++ tests/gold_tests/h2/gold/post_chunked.gold | 2 +- .../gold_tests/headers/cache_and_req_body-hit.gold | 2 +- .../headers/cache_and_req_body-hit_close.gold | 2 +- .../headers/cache_and_req_body-miss.gold | 2 +- .../gold_tests/headers/cache_and_req_body.test.py | 10 +- tests/gold_tests/headers/forwarded-observer.py | 4 +- tests/gold_tests/headers/via-observer.py | 2 +- tests/gold_tests/post_error/post_server.c | 17 +- tests/gold_tests/runroot/runroot_init.test.py | 14 +- tests/gold_tests/runroot/runroot_remove.test.py | 8 +- tests/tools/microServer/README.md | 48 ++- tests/tools/microServer/uWServer.py | 132 ++++--- tests/tools/plugins/continuations_verify.cc | 3 - tests/tools/sessionvalidation/response.py | 15 +- tests/tools/sessionvalidation/sessionvalidation.py | 10 +- tests/unit_tests/Makefile.am | 8 +- tools/Makefile.am | 18 +- tools/clang-format.sh | 6 +- tools/http_load/http_load.c | 17 +- tools/http_load/timers.c | 4 +- tools/http_load/timers.h | 5 +- tools/jtest/jtest.cc | 254 +++++++------- 837 files changed, 8285 insertions(+), 7591 deletions(-) diff --cc iocore/net/I_NetProcessor.h index b49fb2a,d76172a..e9ed12b --- a/iocore/net/I_NetProcessor.h +++ b/iocore/net/I_NetProcessor.h @@@ -269,7 -268,3 +268,4 @@@ extern inkcoreapi NetProcessor &netProc */ extern inkcoreapi NetProcessor &sslNetProcessor; - +extern inkcoreapi NetProcessor &quicNetProcessor; - - #endif diff --cc iocore/net/Makefile.am index 1b575c9,6ebb1d5..6beec5f --- a/iocore/net/Makefile.am +++ b/iocore/net/Makefile.am @@@ -16,23 -16,19 +16,23 @@@ # See the License for the specific language governing permissions and # limitations under the License. +if ENABLE_QUIC +SUBDIRS = quic +endif + AM_CPPFLAGS += \ - $(iocore_include_dirs) \ - -I$(abs_top_srcdir)/lib \ - -I$(abs_top_srcdir)/lib/records \ - -I$(abs_top_srcdir)/proxy \ - -I$(abs_top_srcdir)/proxy/hdrs \ - -I$(abs_top_srcdir)/proxy/shared \ - -I$(abs_top_srcdir)/proxy/logging \ - -I$(abs_top_srcdir)/mgmt \ - -I$(abs_top_srcdir)/mgmt/utils \ - -I$(abs_top_srcdir)/proxy/http \ - $(TS_INCLUDES) \ - @OPENSSL_INCLUDES@ + $(iocore_include_dirs) \ + -I$(abs_top_srcdir)/lib \ + -I$(abs_top_srcdir)/lib/records \ + -I$(abs_top_srcdir)/proxy \ + -I$(abs_top_srcdir)/proxy/hdrs \ + -I$(abs_top_srcdir)/proxy/shared \ + -I$(abs_top_srcdir)/proxy/logging \ + -I$(abs_top_srcdir)/mgmt \ + -I$(abs_top_srcdir)/mgmt/utils \ + -I$(abs_top_srcdir)/proxy/http \ + $(TS_INCLUDES) \ + @OPENSSL_INCLUDES@ TESTS = $(check_PROGRAMS) @@@ -40,146 -36,130 +40,146 @@@ check_PROGRAMS = test_certlookup test_U noinst_LIBRARIES = libinknet.a test_certlookup_LDFLAGS = \ - @AM_LDFLAGS@ \ - @OPENSSL_LDFLAGS@ + @AM_LDFLAGS@ \ + @OPENSSL_LDFLAGS@ test_certlookup_SOURCES = \ - test_certlookup.cc \ - SSLCertLookup.cc + test_certlookup.cc \ + SSLCertLookup.cc test_certlookup_LDADD = \ - @OPENSSL_LIBS@ \ - $(top_builddir)/lib/ts/libtsutil.la \ - $(top_builddir)/iocore/eventsystem/libinkevent.a \ - $(top_builddir)/proxy/ParentSelectionStrategy.o + @OPENSSL_LIBS@ \ + $(top_builddir)/lib/ts/libtsutil.la \ + $(top_builddir)/iocore/eventsystem/libinkevent.a \ + $(top_builddir)/proxy/ParentSelectionStrategy.o test_UDPNet_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - $(LUAJIT_CPPFLAGS) \ - $(iocore_include_dirs) \ - -I$(abs_top_srcdir)/proxy \ - -I$(abs_top_srcdir)/proxy/hdrs \ - -I$(abs_top_srcdir)/proxy/http \ - -I$(abs_top_srcdir)/proxy/logging \ - -I$(abs_top_srcdir)/mgmt \ - -I$(abs_top_srcdir)/mgmt/utils \ - @OPENSSL_INCLUDES@ + $(AM_CPPFLAGS) \ + $(LUAJIT_CPPFLAGS) \ + $(iocore_include_dirs) \ + -I$(abs_top_srcdir)/proxy \ + -I$(abs_top_srcdir)/proxy/hdrs \ + -I$(abs_top_srcdir)/proxy/http \ + -I$(abs_top_srcdir)/proxy/logging \ + -I$(abs_top_srcdir)/mgmt \ + -I$(abs_top_srcdir)/mgmt/utils \ + @OPENSSL_INCLUDES@ test_UDPNet_LDFLAGS = \ - @AM_LDFLAGS@ \ - @OPENSSL_LDFLAGS@ + @AM_LDFLAGS@ \ + @OPENSSL_LDFLAGS@ test_UDPNet_LDADD = \ - libinknet.a \ - $(top_builddir)/iocore/eventsystem/libinkevent.a \ - $(top_builddir)/mgmt/libmgmt_p.la \ - $(top_builddir)/lib/records/librecords_p.a \ - $(top_builddir)/lib/ts/libtsutil.la \ - $(top_builddir)/proxy/ParentSelectionStrategy.o \ - $(top_builddir)/lib/tsconfig/libtsconfig.la \ - $(top_builddir)/lib/luajit/src/libluajit.a \ - @LIBTCL@ @HWLOC_LIBS@ @OPENSSL_LIBS@ + libinknet.a \ + $(top_builddir)/iocore/eventsystem/libinkevent.a \ + $(top_builddir)/mgmt/libmgmt_p.la \ + $(top_builddir)/lib/records/librecords_p.a \ + $(top_builddir)/lib/ts/libtsutil.la \ + $(top_builddir)/proxy/ParentSelectionStrategy.o \ + $(top_builddir)/lib/tsconfig/libtsconfig.la \ + $(top_builddir)/lib/luajit/src/libluajit.a \ + @LIBTCL@ @HWLOC_LIBS@ @OPENSSL_LIBS@ test_UDPNet_SOURCES = \ - test_I_UDPNet.cc + test_I_UDPNet.cc libinknet_a_SOURCES = \ - BIO_fastopen.cc \ - BIO_fastopen.h \ - Connection.cc \ - I_Net.h \ - I_NetProcessor.h \ - I_NetVConnection.h \ - I_Socks.h \ - I_UDPConnection.h \ - I_UDPNet.h \ - I_UDPPacket.h \ - Inline.cc \ - I_SessionAccept.h \ - SessionAccept.cc \ - LuaSNIConfig.h \ - LuaSNIConfig.cc \ - Net.cc \ - NetVConnection.cc \ - P_SNIActionPerformer.h \ - P_CompletionUtil.h \ - P_Connection.h \ - P_InkBulkIO.h \ - P_LibBulkIO.h \ - P_Net.h \ - P_NetAccept.h \ - P_NetVConnection.h \ - P_Socks.h \ - P_SSLCertLookup.h \ - P_SSLConfig.h \ - P_SSLNetAccept.h \ - P_SSLNetProcessor.h \ - P_SSLNetVConnection.h \ - P_SSLNextProtocolAccept.h \ - P_SSLNextProtocolSet.h \ - P_SSLSNI.h \ - P_SSLUtils.h \ - P_SSLClientUtils.h \ - P_OCSPStapling.h \ - P_Socks.h \ - P_UDPConnection.h \ - P_UDPIOEvent.h \ - P_UDPNet.h \ - P_UDPPacket.h \ - P_UnixCompletionUtil.h \ - P_UnixNet.h \ - P_UnixNetProcessor.h \ - P_UnixNetState.h \ - P_UnixNetVConnection.h \ - P_UnixPollDescriptor.h \ - P_UnixUDPConnection.h \ - Socks.cc \ - SNIActionPerformer.cc \ - SSLCertLookup.cc \ - SSLSessionCache.cc \ - SSLConfig.cc \ - SSLInternal.cc \ - SSLNetAccept.cc \ - SSLNetProcessor.cc \ - SSLNetVConnection.cc \ - SSLNextProtocolAccept.cc \ - SSLNextProtocolSet.cc \ - SSLSNIConfig.cc \ - SSLUtils.cc \ - SSLClientUtils.cc \ - OCSPStapling.cc \ - Socks.cc \ - UDPIOEvent.cc \ - UnixConnection.cc \ - UnixNet.cc \ - UnixNetAccept.cc \ - UnixNetPages.cc \ - UnixNetProcessor.cc \ - UnixNetVConnection.cc \ - UnixUDPConnection.cc \ - UnixUDPNet.cc \ - SSLDynlock.cc + BIO_fastopen.cc \ + BIO_fastopen.h \ + Connection.cc \ + I_Net.h \ + I_NetProcessor.h \ + I_NetVConnection.h \ + I_Socks.h \ + I_UDPConnection.h \ + I_UDPNet.h \ + I_UDPPacket.h \ + Inline.cc \ + I_SessionAccept.h \ + SessionAccept.cc \ + LuaSNIConfig.h \ + LuaSNIConfig.cc \ + Net.cc \ + NetVConnection.cc \ + P_SNIActionPerformer.h \ + P_CompletionUtil.h \ + P_Connection.h \ + P_InkBulkIO.h \ + P_LibBulkIO.h \ + P_Net.h \ + P_NetAccept.h \ + P_NetVConnection.h \ + P_Socks.h \ + P_SSLCertLookup.h \ + P_SSLConfig.h \ + P_SSLNetAccept.h \ + P_SSLNetProcessor.h \ + P_SSLNetVConnection.h \ + P_SSLNextProtocolAccept.h \ + P_SSLNextProtocolSet.h \ + P_SSLSNI.h \ + P_SSLUtils.h \ + P_SSLClientUtils.h \ + P_OCSPStapling.h \ + P_Socks.h \ + P_UDPConnection.h \ + P_UDPIOEvent.h \ + P_UDPNet.h \ + P_UDPPacket.h \ + P_UnixCompletionUtil.h \ + P_UnixNet.h \ + P_UnixNetProcessor.h \ + P_UnixNetState.h \ + P_UnixNetVConnection.h \ + P_UnixPollDescriptor.h \ + P_UnixUDPConnection.h \ + Socks.cc \ + SNIActionPerformer.cc \ + SSLCertLookup.cc \ + SSLSessionCache.cc \ + SSLConfig.cc \ + SSLInternal.cc \ + SSLNetAccept.cc \ + SSLNetProcessor.cc \ + SSLNetVConnection.cc \ + SSLNextProtocolAccept.cc \ + SSLNextProtocolSet.cc \ + SSLSNIConfig.cc \ + SSLUtils.cc \ + SSLClientUtils.cc \ + OCSPStapling.cc \ + Socks.cc \ + UDPIOEvent.cc \ + UnixConnection.cc \ + UnixNet.cc \ + UnixNetAccept.cc \ + UnixNetPages.cc \ + UnixNetProcessor.cc \ + UnixNetVConnection.cc \ + UnixUDPConnection.cc \ + 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 + if BUILD_TESTS - libinknet_a_SOURCES += \ - NetVCTest.cc \ - P_NetVCTest.h + libinknet_a_SOURCES += \ + NetVCTest.cc \ + P_NetVCTest.h endif libinknet_a_LIBADD = \ diff --cc iocore/net/P_UnixNetVConnection.h index 396387b,7a8884d..fdb340c --- a/iocore/net/P_UnixNetVConnection.h +++ b/iocore/net/P_UnixNetVConnection.h @@@ -436,6 -433,3 +433,4 @@@ UnixNetVConnection::set_action(Continua void write_to_net(NetHandler *nh, UnixNetVConnection *vc, EThread *thread); void write_to_net_io(NetHandler *nh, UnixNetVConnection *vc, EThread *thread); +void net_activity(UnixNetVConnection *vc, EThread *thread); - - #endif diff --cc lib/ts/Makefile.am index d660837,b0d7ea7..7bb1365 --- a/lib/ts/Makefile.am +++ b/lib/ts/Makefile.am @@@ -39,189 -39,179 +39,191 @@@ AM_CPPFLAGS += libtsutil_la_LDFLAGS = -no-undefined -version-info @TS_LIBTOOL_VERSION@ libtsutil_la_LIBADD = \ - @HWLOC_LIBS@ \ - @LIBOBJS@ \ - @LIBPCRE@ \ - @OPENSSL_LIBS@ \ - @LIBTCL@ \ - @LIBRESOLV@ \ - @LIBCAP@ \ - -lc + @HWLOC_LIBS@ \ + @LIBOBJS@ \ + @LIBPCRE@ \ + @OPENSSL_LIBS@ \ + @LIBTCL@ \ + @LIBRESOLV@ \ + @LIBCAP@ \ + -lc libtsutil_la_SOURCES = \ - Allocator.h \ - Arena.cc \ - Arena.h \ - BaseLogFile.cc \ - BaseLogFile.h \ - Bitops.cc \ - Bitops.h \ - BufferWriter.h \ - BufferWriterForward.h \ - BufferWriterFormat.cc \ - ConsistentHash.cc \ - ConsistentHash.h \ - ContFlags.cc \ - ContFlags.h \ - CryptoHash.cc \ - CryptoHash.h \ - defalloc.h \ - Diags.cc \ - Diags.h \ - DynArray.h \ - EventNotify.cc \ - EventNotify.h \ - fastlz.c \ - fastlz.h \ - Hash.cc \ - HashFNV.cc \ - HashFNV.h \ - Hash.h \ - HashMD5.cc \ - HashMD5.h \ - HashSip.cc \ - HashSip.h \ - History.h \ - HostLookup.cc \ - HostLookup.h \ - hugepages.cc \ - hugepages.h \ - I_Layout.h \ - ink_aiocb.h \ - ink_align.h \ - ink_apidefs.h \ - ink_args.cc \ - ink_args.h \ - ink_assert.cc \ - ink_assert.h \ - ink_atomic.h \ - ink_base64.cc \ - ink_base64.h \ - ink_cap.cc \ - ink_cap.h \ - ink_code.cc \ - ink_code.h \ - ink_defs.cc \ - ink_defs.h \ - InkErrno.cc \ - InkErrno.h \ - ink_error.cc \ - ink_error.h \ - ink_exception.h \ - ink_file.cc \ - ink_file.h \ - ink_hash_table.cc \ - ink_hash_table.h \ - ink_hrtime.cc \ - ink_hrtime.h \ - ink_inet.cc \ - ink_inet.h \ - ink_inout.h \ - ink_llqueue.h \ - ink_lockfile.h \ - INK_MD5.h \ - ink_memory.cc \ - ink_memory.h \ - ink_mutex.cc \ - ink_mutex.h \ - ink_platform.h \ - ink_queue.cc \ - ink_queue.h \ - ink_queue_utils.cc \ - ink_rand.cc \ - ink_rand.h \ - ink_res_init.cc \ - ink_res_mkquery.cc \ - ink_resolver.h \ - ink_resource.cc \ - ink_resource.h \ - ink_rwlock.cc \ - ink_rwlock.h \ - ink_sock.cc \ - ink_sock.h \ - ink_sprintf.cc \ - ink_sprintf.h \ + Allocator.h \ + Arena.cc \ + Arena.h \ + BaseLogFile.cc \ + BaseLogFile.h \ + Bitops.cc \ + Bitops.h \ + BufferWriter.h \ + BufferWriterForward.h \ + BufferWriterFormat.cc \ + ConsistentHash.cc \ + ConsistentHash.h \ + ContFlags.cc \ + ContFlags.h \ + CryptoHash.cc \ + CryptoHash.h \ + defalloc.h \ + Diags.cc \ + Diags.h \ + DynArray.h \ + EventNotify.cc \ + EventNotify.h \ + fastlz.c \ + fastlz.h \ + Hash.cc \ + HashFNV.cc \ + HashFNV.h \ + Hash.h \ + HashMD5.cc \ + HashMD5.h \ + HashSip.cc \ + HashSip.h \ + History.h \ + HostLookup.cc \ + HostLookup.h \ + hugepages.cc \ + hugepages.h \ + I_Layout.h \ + ink_aiocb.h \ + ink_align.h \ + ink_apidefs.h \ + ink_args.cc \ + ink_args.h \ + ink_assert.cc \ + ink_assert.h \ + ink_atomic.h \ + ink_base64.cc \ + ink_base64.h \ + ink_cap.cc \ + ink_cap.h \ + ink_code.cc \ + ink_code.h \ + ink_defs.cc \ + ink_defs.h \ + InkErrno.cc \ + InkErrno.h \ + ink_error.cc \ + ink_error.h \ + ink_exception.h \ + ink_file.cc \ + ink_file.h \ + ink_hash_table.cc \ + ink_hash_table.h \ + ink_hrtime.cc \ + ink_hrtime.h \ + ink_inet.cc \ + ink_inet.h \ + ink_inout.h \ + ink_llqueue.h \ + ink_lockfile.h \ + INK_MD5.h \ + ink_memory.cc \ + ink_memory.h \ + ink_mutex.cc \ + ink_mutex.h \ + ink_platform.h \ + ink_queue.cc \ + ink_queue.h \ + ink_queue_utils.cc \ + ink_rand.cc \ + ink_rand.h \ + ink_res_init.cc \ + ink_res_mkquery.cc \ + ink_resolver.h \ + ink_resource.cc \ + ink_resource.h \ + ink_rwlock.cc \ + ink_rwlock.h \ + ink_sock.cc \ + ink_sock.h \ + ink_sprintf.cc \ + ink_sprintf.h \ ink_std_compat.h \ - ink_stack_trace.cc \ - ink_stack_trace.h \ - ink_string.cc \ - ink_string++.cc \ - ink_string.h \ - ink_string++.h \ - ink_sys_control.cc \ - ink_sys_control.h \ - ink_syslog.cc \ - ink_syslog.h \ - ink_thread.cc \ - ink_thread.h \ - ink_time.cc \ - ink_time.h \ - ink_uuid.cc \ - ink_uuid.h \ - IntrusiveDList.h \ - IpMap.cc \ - IpMapConf.cc \ - IpMapConf.h \ - IpMap.h \ - I_Version.h \ - JeAllocator.h \ - JeAllocator.cc \ - Layout.cc \ - List.h \ - llqueue.cc \ - lockfile.cc \ - Map.h \ - MatcherUtils.cc \ - MatcherUtils.h \ - MemSpan.h \ - MMH.cc \ - MMH.h \ - MT_hashtable.h \ - ParseRules.cc \ - ParseRules.h \ - PriorityQueue.h \ - Ptr.h \ - RawHashTable.cc \ - RawHashTable.h \ - RbTree.cc \ - RbTree.h \ - Regex.cc \ - Regex.h \ - Regression.cc \ - Regression.h \ - Result.h \ - runroot.cc \ - runroot.h \ - signals.cc \ - signals.h \ - SimpleTokenizer.h \ - SourceLocation.cc \ - SourceLocation.h \ - string_view.h \ - TestBox.h \ - TextBuffer.cc \ - TextBuffer.h \ - TextView.h TextView.cc \ - Tokenizer.cc \ - Tokenizer.h \ - Trie.h \ - TsBuffer.h \ - Version.cc \ - X509HostnameValidator.cc \ - X509HostnameValidator.h + ink_stack_trace.cc \ + ink_stack_trace.h \ + ink_string.cc \ + ink_string++.cc \ + ink_string.h \ + ink_string++.h \ + ink_sys_control.cc \ + ink_sys_control.h \ + ink_syslog.cc \ + ink_syslog.h \ + ink_thread.cc \ + ink_thread.h \ + ink_time.cc \ + ink_time.h \ + ink_uuid.cc \ + ink_uuid.h \ + IntrusiveDList.h \ + IpMap.cc \ + IpMapConf.cc \ + IpMapConf.h \ + IpMap.h \ + I_Version.h \ + JeAllocator.h \ + JeAllocator.cc \ + Layout.cc \ + List.h \ + llqueue.cc \ + lockfile.cc \ + Map.h \ + MatcherUtils.cc \ + MatcherUtils.h \ + MemSpan.h \ + MemArena.cc \ + MemArena.h \ + MMH.cc \ + MMH.h \ + MT_hashtable.h \ + ParseRules.cc \ + ParseRules.h \ + PriorityQueue.h \ + Ptr.h \ + RawHashTable.cc \ + RawHashTable.h \ + RbTree.cc \ + RbTree.h \ + Regex.cc \ + Regex.h \ + Regression.cc \ + Regression.h \ + Result.h \ + runroot.cc \ + runroot.h \ + signals.cc \ + signals.h \ + SimpleTokenizer.h \ + SourceLocation.cc \ + SourceLocation.h \ + string_view.h \ + TestBox.h \ + TextBuffer.cc \ + TextBuffer.h \ + TextView.h TextView.cc \ + Tokenizer.cc \ + Tokenizer.h \ + Trie.h \ + TsBuffer.h \ + Version.cc \ + X509HostnameValidator.cc \ + X509HostnameValidator.h +if HAS_HKDF +if OPENSSL_IS_BORINGSSL +HKDF_impl = HKDF_boringssl.cc +else +HKDF_impl = HKDF_openssl.cc +endif +libtsutil_la_SOURCES += \ + HKDF.h \ + $(HKDF_impl) +endif + + #test_UNUSED_SOURCES = \ # load_http_hdr.cc \ # IntrusivePtrTest.cc \ @@@ -282,14 -274,8 +286,13 @@@ test_tslib_SOURCES = unit-tests/test_MT_hashtable.cc \ unit-tests/test_Scalar.cc \ unit-tests/test_string_view.cc \ - unit-tests/test_TextView.cc \ - unit-tests/test_MemSpan.cc + unit-tests/test_TextView.cc +if HAS_HKDF +test_tslib_SOURCES += \ + unit-tests/test_HKDF.cc +endif + CompileParseRules_SOURCES = CompileParseRules.cc clean-local: diff --cc lib/ts/ink_memory.h index 55caf2d,c397d50..9e22887 --- a/lib/ts/ink_memory.h +++ b/lib/ts/ink_memory.h @@@ -604,10 -601,4 +603,8 @@@ path_join(ats_scoped_str const &lhs, at return x.release(); } + +using ats_unique_buf = std::unique_ptr<uint8_t, decltype(&ats_free)>; +ats_unique_buf ats_unique_malloc(size_t size); + #endif /* __cplusplus */ - - #endif diff --cc proxy/Makefile.am index da317b6,0a9536c..ac4b53e --- a/proxy/Makefile.am +++ b/proxy/Makefile.am @@@ -20,35 -20,30 +20,35 @@@ include $(top_srcdir)/build/tidy.m # Note that hdrs is targeted from ../Makefile.am SUBDIRS = http http2 logging config +if ENABLE_QUIC +SUBDIRS += hq +endif + noinst_LIBRARIES = bin_PROGRAMS = \ - traffic_server \ - traffic_logcat \ - traffic_logstats + traffic_server \ + traffic_logcat \ + traffic_logstats TESTS = \ - tests/test_logstats_json \ - tests/test_logstats_summary + tests/test_logstats_json \ + tests/test_logstats_summary AM_CPPFLAGS += \ - $(iocore_include_dirs) \ - -I$(abs_top_srcdir)/lib/records \ - -I$(abs_srcdir)/http \ - -I$(abs_srcdir)/http2 \ - -I$(abs_srcdir)/hq \ - -I$(abs_srcdir)/logging \ - -I$(abs_srcdir)/http/remap \ - -I$(abs_srcdir)/hdrs \ - -I$(abs_srcdir)/shared \ - -I$(abs_top_srcdir)/mgmt \ - -I$(abs_top_srcdir)/mgmt/utils \ - -I$(abs_top_srcdir)/lib \ - $(TS_INCLUDES) \ - @OPENSSL_INCLUDES@ + $(iocore_include_dirs) \ + -I$(abs_top_srcdir)/lib/records \ + -I$(abs_srcdir)/http \ + -I$(abs_srcdir)/http2 \ ++ -I$(abs_srcdir)/hq \ + -I$(abs_srcdir)/logging \ + -I$(abs_srcdir)/http/remap \ + -I$(abs_srcdir)/hdrs \ + -I$(abs_srcdir)/shared \ + -I$(abs_top_srcdir)/mgmt \ + -I$(abs_top_srcdir)/mgmt/utils \ + -I$(abs_top_srcdir)/lib \ + $(TS_INCLUDES) \ + @OPENSSL_INCLUDES@ # NOTE: it is safe to use AM_LDFLAGS here because we are only building executables. If we start # building libtool archives, change these to only apply to the executables. @@@ -186,55 -181,43 +186,55 @@@ traffic_server_SOURCES += endif traffic_server_LDADD = \ - http/libhttp.a \ - http2/libhttp2.a \ - http/remap/libhttp_remap.a \ - logging/liblogging.a \ - logging/liblogcollation.a \ - hdrs/libhdrs.a \ - shared/libdiagsconfig.a \ - $(top_builddir)/mgmt/libmgmt_p.la \ - $(top_builddir)/iocore/utils/libinkutils.a \ - $(top_builddir)/iocore/dns/libinkdns.a \ - $(top_builddir)/iocore/hostdb/libinkhostdb.a \ - $(top_builddir)/iocore/dns/libinkdns.a \ - $(top_builddir)/iocore/cache/libinkcache.a \ - $(top_builddir)/iocore/aio/libinkaio.a \ - $(top_builddir)/lib/ts/libtsutil.la \ - $(top_builddir)/lib/bindings/libbindings.la + http/libhttp.a \ + http2/libhttp2.a \ + http/remap/libhttp_remap.a \ + logging/liblogging.a \ + logging/liblogcollation.a \ + hdrs/libhdrs.a \ + shared/libdiagsconfig.a \ + $(top_builddir)/mgmt/libmgmt_p.la \ + $(top_builddir)/iocore/utils/libinkutils.a \ + $(top_builddir)/iocore/dns/libinkdns.a \ + $(top_builddir)/iocore/hostdb/libinkhostdb.a \ + $(top_builddir)/iocore/dns/libinkdns.a \ + $(top_builddir)/iocore/cache/libinkcache.a \ + $(top_builddir)/iocore/aio/libinkaio.a \ + $(top_builddir)/lib/ts/libtsutil.la \ + $(top_builddir)/lib/bindings/libbindings.la +if ENABLE_QUIC +traffic_server_LDADD += \ + hq/libhq.a +endif + if BUILD_LUAJIT traffic_server_LDADD += \ - $(top_builddir)/lib/luajit/src/libluajit.a + $(top_builddir)/lib/luajit/src/libluajit.a endif traffic_server_LDADD += \ - $(top_builddir)/iocore/net/libinknet.a - $(top_builddir)/iocore/net/libinknet.a \ ++ $(top_builddir)/iocore/net/libinknet.a + - if ENABLE_QUIC ++ if ENABLE_QUIC +traffic_server_LDADD += \ - $(top_builddir)/iocore/net/quic/libquic.a ++ $(top_builddir)/iocore/net/quic/libquic.a +endif + +traffic_server_LDADD += \ - $(top_builddir)/iocore/eventsystem/libinkevent.a \ - $(top_builddir)/lib/records/librecords_p.a \ - $(top_builddir)/iocore/eventsystem/libinkevent.a \ - $(top_builddir)/lib/tsconfig/libtsconfig.la \ - @HWLOC_LIBS@ \ - @LIBPCRE@ \ - @LIBTCL@ \ - @LIBRESOLV@ \ - @LIBZ@ \ - @LIBLZMA@ \ - @LIBPROFILER@ \ - @OPENSSL_LIBS@ \ - -lm + $(top_builddir)/iocore/eventsystem/libinkevent.a \ + $(top_builddir)/lib/records/librecords_p.a \ + $(top_builddir)/iocore/eventsystem/libinkevent.a \ + $(top_builddir)/lib/tsconfig/libtsconfig.la \ + @HWLOC_LIBS@ \ + @LIBPCRE@ \ + @LIBTCL@ \ + @LIBRESOLV@ \ + @LIBZ@ \ + @LIBLZMA@ \ + @LIBPROFILER@ \ + @OPENSSL_LIBS@ \ + -lm if BUILD_LUAJIT traffic_server_LDADD += $(LUAJIT:%=$(top_builddir)/lib/luajit/src/%) diff --cc proxy/http/Makefile.am index fda9aca,c437e95..08597c1 --- a/proxy/http/Makefile.am +++ b/proxy/http/Makefile.am @@@ -21,19 -21,18 +21,19 @@@ include $(top_srcdir)/build/tidy.m SUBDIRS = remap AM_CPPFLAGS += \ - $(iocore_include_dirs) \ - -I$(abs_top_srcdir)/proxy \ - -I$(abs_top_srcdir)/lib \ - -I$(abs_top_srcdir)/lib/records \ - -I$(abs_top_srcdir)/mgmt \ - -I$(abs_top_srcdir)/mgmt/utils \ - -I$(abs_top_srcdir)/proxy/hdrs \ - -I$(abs_top_srcdir)/proxy/shared \ - -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 \ - $(TS_INCLUDES) + $(iocore_include_dirs) \ + -I$(abs_top_srcdir)/proxy \ + -I$(abs_top_srcdir)/lib \ + -I$(abs_top_srcdir)/lib/records \ + -I$(abs_top_srcdir)/mgmt \ + -I$(abs_top_srcdir)/mgmt/utils \ + -I$(abs_top_srcdir)/proxy/hdrs \ + -I$(abs_top_srcdir)/proxy/shared \ + -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 \ + $(TS_INCLUDES) noinst_HEADERS = HttpProxyServerMain.h noinst_LIBRARIES = libhttp.a -- To stop receiving notification emails like this one, please contact [email protected].
