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 c9d5e5404c4af7fa832c226bb9b5a1800424b5c4 Merge: 0e2934c 032920f Author: Masakazu Kitajo <[email protected]> AuthorDate: Thu Jun 21 14:55:28 2018 +0900 Merge branch 'master' into quic-latest .gitignore | 26 +- CMakeLists.txt | 274 +- Makefile.am | 5 +- NOTICE | 11 +- README | 109 +- build/jemalloc.m4 | 1 + build/yaml-cpp.m4 | 82 + ci/jenkins/bin/clang-analyzer.sh | 14 +- ci/jenkins/bin/gh-mirror.sh | 2 + ci/rat-regex.txt | 2 +- cmd/Makefile.am | 35 - cmd/traffic_cache_tool/Makefile.am | 47 - configure.ac | 70 +- doc/.tx/config | 5 - doc/admin-guide/files/logging.config.en.rst | 107 +- doc/admin-guide/files/parent.config.en.rst | 44 +- doc/admin-guide/files/records.config.en.rst | 16 +- .../files/ssl_server_name.config.en.rst | 36 +- doc/admin-guide/logging/destinations.en.rst | 16 +- doc/admin-guide/logging/examples.en.rst | 114 +- doc/admin-guide/logging/formatting.en.rst | 17 +- doc/admin-guide/logging/understanding.en.rst | 10 +- doc/admin-guide/plugins/lua.en.rst | 4 +- doc/appendices/command-line/traffic_ctl.en.rst | 5 +- doc/appendices/command-line/traffic_wccp.en.rst | 2 +- doc/conf.py | 1 + .../api/functions/TSUrlDestroy.en.rst | 44 - doc/developer-guide/api/functions/TSfread.en.rst | 9 +- doc/developer-guide/api/functions/TSfwrite.en.rst | 8 +- .../internal-libraries/buffer-writer.en.rst | 53 +- .../plugins/http-headers/mime-headers.en.rst | 15 +- .../plugins/http-headers/urls.en.rst | 1 - .../transparent-proxy/wccp-service-config.en.po | 2 +- .../appendices/command-line/traffic_wccp.en.po | 2 +- .../api/functions/TSUrlDestroy.en.po | 71 - .../plugins/http-headers/mime-headers.en.po | 4 +- .../plugins/http-headers/urls.en.po | 4 +- doc/static/languages.json | 20 +- example/add_header/readme.txt | 2 +- example/cppapi/async_http_fetch/AsyncHttpFetch.cc | 2 +- example/cppapi/boom/boom.cc | 2 +- example/cppapi/clientrequest/ClientRequest.cc | 4 +- .../GzipTransformationPlugin.cc | 10 +- example/cppapi/logger_example/LoggerExample.cc | 4 +- example/cppapi/serverresponse/ServerResponse.cc | 2 +- example/cppapi/stat_example/StatExample.cc | 2 +- example/disable_http2/disable_http2.cc | 2 +- example/intercept/intercept.cc | 2 +- example/output_header/output_header.c | 2 +- example/output_header/readme | 2 +- example/passthru/passthru.cc | 2 +- example/protocol/TxnSM.c | 4 +- example/remap/remap.cc | 2 +- example/response_header_1/response_header_1.c | 2 +- example/secure_link/readme.txt | 2 +- example/ssl_sni/ssl_sni.cc | 2 +- example/thread_pool/psi.c | 2 +- example/version/version.c | 4 +- iocore/cache/CacheWrite.cc | 1 - iocore/eventsystem/IOBuffer.cc | 103 +- iocore/eventsystem/I_EventProcessor.h | 20 +- iocore/eventsystem/I_IOBuffer.h | 236 +- iocore/eventsystem/P_IOBuffer.h | 2 +- iocore/eventsystem/UnixEThread.cc | 1 - iocore/eventsystem/UnixEventProcessor.cc | 14 +- iocore/hostdb/HostDB.cc | 10 +- iocore/hostdb/P_HostDBProcessor.h | 2 +- iocore/net/LuaSNIConfig.cc | 127 - iocore/net/LuaSNIConfig.h | 113 - iocore/net/Makefile.am | 12 +- iocore/net/P_SSLSNI.h | 4 +- iocore/net/SSLClientUtils.cc | 18 +- iocore/net/SSLConfig.cc | 2 +- iocore/net/SSLNetVConnection.cc | 7 - iocore/net/SSLSNIConfig.cc | 27 +- iocore/net/UnixUDPNet.cc | 4 - iocore/net/YamlSNIConfig.cc | 107 + iocore/net/YamlSNIConfig.h | 62 + lib/Makefile.am | 35 +- lib/bindings/bindings.cc | 317 - lib/bindings/bindings.h | 73 - lib/bindings/lua.cc | 100 - lib/bindings/lua.h | 101 - lib/bindings/repl.cc | 60 - lib/bindings/repl.h | 27 - lib/cppapi/AsyncTimer.cc | 19 +- lib/cppapi/include/atscppapi/AsyncTimer.h | 13 +- lib/luajit/.gitignore | 11 - lib/luajit/COPYRIGHT | 56 - lib/luajit/Makefile | 151 - lib/luajit/README | 16 - lib/luajit/doc/bluequad-print.css | 166 - lib/luajit/doc/bluequad.css | 325 - lib/luajit/doc/changes.html | 978 -- lib/luajit/doc/contact.html | 102 - lib/luajit/doc/ext_c_api.html | 187 - lib/luajit/doc/ext_ffi.html | 330 - lib/luajit/doc/ext_ffi_api.html | 566 -- lib/luajit/doc/ext_ffi_semantics.html | 1245 --- lib/luajit/doc/ext_ffi_tutorial.html | 601 -- lib/luajit/doc/ext_jit.html | 199 - lib/luajit/doc/extensions.html | 408 - lib/luajit/doc/faq.html | 184 - lib/luajit/doc/img/contact.png | Bin 1340 -> 0 bytes lib/luajit/doc/install.html | 646 -- lib/luajit/doc/luajit.html | 234 - lib/luajit/doc/running.html | 306 - lib/luajit/doc/status.html | 116 - lib/luajit/dynasm/dasm_arm.h | 456 - lib/luajit/dynasm/dasm_arm.lua | 1125 --- lib/luajit/dynasm/dasm_mips.h | 416 - lib/luajit/dynasm/dasm_mips.lua | 953 -- lib/luajit/dynasm/dasm_ppc.h | 412 - lib/luajit/dynasm/dasm_ppc.lua | 1249 --- lib/luajit/dynasm/dasm_proto.h | 83 - lib/luajit/dynasm/dasm_x64.lua | 12 - lib/luajit/dynasm/dasm_x86.h | 472 - lib/luajit/dynasm/dasm_x86.lua | 1945 ---- lib/luajit/dynasm/dynasm.lua | 1094 --- lib/luajit/etc/luajit.1 | 88 - lib/luajit/etc/luajit.pc | 25 - lib/luajit/src/.gitignore | 7 - lib/luajit/src/Makefile | 684 -- lib/luajit/src/Makefile.dep | 226 - lib/luajit/src/host/.gitignore | 3 - lib/luajit/src/host/README | 4 - lib/luajit/src/host/buildvm.c | 516 -- lib/luajit/src/host/buildvm.h | 104 - lib/luajit/src/host/buildvm_asm.c | 313 - lib/luajit/src/host/buildvm_fold.c | 229 - lib/luajit/src/host/buildvm_lib.c | 398 - lib/luajit/src/host/buildvm_peobj.c | 368 - lib/luajit/src/host/genminilua.lua | 428 - lib/luajit/src/host/minilua.c | 7770 ---------------- lib/luajit/src/jit/.gitignore | 1 - lib/luajit/src/jit/bc.lua | 191 - lib/luajit/src/jit/bcsave.lua | 659 -- lib/luajit/src/jit/dis_arm.lua | 689 -- lib/luajit/src/jit/dis_mips.lua | 428 - lib/luajit/src/jit/dis_mipsel.lua | 20 - lib/luajit/src/jit/dis_ppc.lua | 591 -- lib/luajit/src/jit/dis_x64.lua | 20 - lib/luajit/src/jit/dis_x86.lua | 836 -- lib/luajit/src/jit/dump.lua | 699 -- lib/luajit/src/jit/v.lua | 167 - lib/luajit/src/lauxlib.h | 167 - lib/luajit/src/lib_aux.c | 356 - lib/luajit/src/lib_base.c | 683 -- lib/luajit/src/lib_bit.c | 74 - lib/luajit/src/lib_debug.c | 405 - lib/luajit/src/lib_ffi.c | 851 -- lib/luajit/src/lib_init.c | 55 - lib/luajit/src/lib_io.c | 539 -- lib/luajit/src/lib_jit.c | 663 -- lib/luajit/src/lib_math.c | 233 - lib/luajit/src/lib_os.c | 287 - lib/luajit/src/lib_package.c | 602 -- lib/luajit/src/lib_string.c | 940 -- lib/luajit/src/lib_table.c | 300 - lib/luajit/src/lj.supp | 26 - lib/luajit/src/lj_alloc.c | 1396 --- lib/luajit/src/lj_alloc.h | 17 - lib/luajit/src/lj_api.c | 1200 --- lib/luajit/src/lj_arch.h | 437 - lib/luajit/src/lj_asm.c | 1920 ---- lib/luajit/src/lj_asm.h | 17 - lib/luajit/src/lj_asm_arm.h | 2361 ----- lib/luajit/src/lj_asm_mips.h | 1977 ---- lib/luajit/src/lj_asm_ppc.h | 2169 ----- lib/luajit/src/lj_asm_x86.h | 2806 ------ lib/luajit/src/lj_bc.c | 14 - lib/luajit/src/lj_bc.h | 261 - lib/luajit/src/lj_bcdump.h | 66 - lib/luajit/src/lj_bcread.c | 476 - lib/luajit/src/lj_bcwrite.c | 396 - lib/luajit/src/lj_carith.c | 353 - lib/luajit/src/lj_carith.h | 27 - lib/luajit/src/lj_ccall.c | 900 -- lib/luajit/src/lj_ccall.h | 171 - lib/luajit/src/lj_ccallback.c | 644 -- lib/luajit/src/lj_ccallback.h | 25 - lib/luajit/src/lj_cconv.c | 752 -- lib/luajit/src/lj_cconv.h | 70 - lib/luajit/src/lj_cdata.c | 285 - lib/luajit/src/lj_cdata.h | 75 - lib/luajit/src/lj_char.c | 43 - lib/luajit/src/lj_char.h | 42 - lib/luajit/src/lj_clib.c | 409 - lib/luajit/src/lj_clib.h | 29 - lib/luajit/src/lj_cparse.c | 1877 ---- lib/luajit/src/lj_cparse.h | 65 - lib/luajit/src/lj_crecord.c | 1671 ---- lib/luajit/src/lj_crecord.h | 31 - lib/luajit/src/lj_ctype.c | 634 -- lib/luajit/src/lj_ctype.h | 461 - lib/luajit/src/lj_debug.c | 605 -- lib/luajit/src/lj_debug.h | 61 - lib/luajit/src/lj_def.h | 353 - lib/luajit/src/lj_dispatch.c | 494 - lib/luajit/src/lj_dispatch.h | 131 - lib/luajit/src/lj_emit_arm.h | 356 - lib/luajit/src/lj_emit_mips.h | 211 - lib/luajit/src/lj_emit_ppc.h | 238 - lib/luajit/src/lj_emit_x86.h | 466 - lib/luajit/src/lj_err.c | 800 -- lib/luajit/src/lj_err.h | 41 - lib/luajit/src/lj_errmsg.h | 193 - lib/luajit/src/lj_ff.h | 18 - lib/luajit/src/lj_ffrecord.c | 888 -- lib/luajit/src/lj_ffrecord.h | 24 - lib/luajit/src/lj_frame.h | 183 - lib/luajit/src/lj_func.c | 185 - lib/luajit/src/lj_func.h | 24 - lib/luajit/src/lj_gc.c | 849 -- lib/luajit/src/lj_gc.h | 134 - lib/luajit/src/lj_gdbjit.c | 795 -- lib/luajit/src/lj_gdbjit.h | 22 - lib/luajit/src/lj_ir.c | 501 - lib/luajit/src/lj_ir.h | 551 -- lib/luajit/src/lj_ircall.h | 277 - lib/luajit/src/lj_iropt.h | 161 - lib/luajit/src/lj_jit.h | 417 - lib/luajit/src/lj_lex.c | 482 - lib/luajit/src/lj_lex.h | 85 - lib/luajit/src/lj_lib.c | 258 - lib/luajit/src/lj_lib.h | 112 - lib/luajit/src/lj_load.c | 168 - lib/luajit/src/lj_mcode.c | 386 - lib/luajit/src/lj_mcode.h | 30 - lib/luajit/src/lj_meta.c | 466 - lib/luajit/src/lj_meta.h | 37 - lib/luajit/src/lj_obj.c | 35 - lib/luajit/src/lj_obj.h | 856 -- lib/luajit/src/lj_opt_dce.c | 78 - lib/luajit/src/lj_opt_fold.c | 2304 ----- lib/luajit/src/lj_opt_loop.c | 436 - lib/luajit/src/lj_opt_mem.c | 916 -- lib/luajit/src/lj_opt_narrow.c | 656 -- lib/luajit/src/lj_opt_sink.c | 245 - lib/luajit/src/lj_opt_split.c | 731 -- lib/luajit/src/lj_parse.c | 2754 ------ lib/luajit/src/lj_parse.h | 18 - lib/luajit/src/lj_record.c | 2252 ----- lib/luajit/src/lj_record.h | 44 - lib/luajit/src/lj_snap.c | 866 -- lib/luajit/src/lj_snap.h | 34 - lib/luajit/src/lj_state.c | 287 - lib/luajit/src/lj_state.h | 35 - lib/luajit/src/lj_str.c | 339 - lib/luajit/src/lj_str.h | 50 - lib/luajit/src/lj_strscan.c | 498 - lib/luajit/src/lj_strscan.h | 39 - lib/luajit/src/lj_tab.c | 631 -- lib/luajit/src/lj_tab.h | 70 - lib/luajit/src/lj_target.h | 162 - lib/luajit/src/lj_target_arm.h | 274 - lib/luajit/src/lj_target_mips.h | 257 - lib/luajit/src/lj_target_ppc.h | 280 - lib/luajit/src/lj_target_x86.h | 342 - lib/luajit/src/lj_trace.c | 816 -- lib/luajit/src/lj_trace.h | 53 - lib/luajit/src/lj_traceerr.h | 61 - lib/luajit/src/lj_udata.c | 34 - lib/luajit/src/lj_udata.h | 14 - lib/luajit/src/lj_vm.h | 116 - lib/luajit/src/lj_vmevent.c | 57 - lib/luajit/src/lj_vmevent.h | 59 - lib/luajit/src/lj_vmmath.c | 140 - lib/luajit/src/ljamalg.c | 93 - lib/luajit/src/lua.h | 393 - lib/luajit/src/lua.hpp | 9 - lib/luajit/src/luaconf.h | 156 - lib/luajit/src/luajit.c | 571 -- lib/luajit/src/luajit.h | 70 - lib/luajit/src/lualib.h | 43 - lib/luajit/src/msvcbuild.bat | 113 - lib/luajit/src/ps4build.bat | 103 - lib/luajit/src/psvitabuild.bat | 93 - lib/luajit/src/vm_arm.dasc | 4486 --------- lib/luajit/src/vm_mips.dasc | 4241 --------- lib/luajit/src/vm_ppc.dasc | 5160 ----------- lib/luajit/src/vm_ppcspe.dasc | 3691 -------- lib/luajit/src/vm_x86.dasc | 6377 ------------- lib/luajit/src/xedkbuild.bat | 92 - lib/ts/BufferWriter.h | 12 +- lib/ts/BufferWriterFormat.cc | 199 +- lib/ts/{runroot.h => EnumDescriptor.h} | 57 +- lib/ts/I_Layout.h | 1 + lib/ts/Layout.cc | 4 +- lib/ts/MemArena.cc | 136 +- lib/ts/MemArena.h | 80 +- lib/ts/apidefs.h.in | 2 - lib/ts/bwf_std_format.h | 23 + lib/ts/ink_inet.cc | 15 +- lib/ts/ink_string.cc | 2 - lib/ts/runroot.cc | 36 +- lib/ts/runroot.h | 8 +- lib/ts/unit-tests/test_BufferWriterFormat.cc | 56 + lib/ts/unit-tests/test_IntrusivePtr.cc | 86 + lib/ts/unit-tests/test_MemArena.cc | 101 +- lib/tsconfig/IntrusivePtr.h | 121 +- lib/tsconfig/Makefile.am | 4 +- lib/tsconfig/TsConfigLua.cc | 55 - lib/tsconfig/TsConfigLua.h | 184 - lib/yamlcpp/.clang-format | 47 + lib/yamlcpp/.codedocs | 50 + lib/yamlcpp/.gitignore | 1 + lib/yamlcpp/.travis.yml | 28 + lib/yamlcpp/CMakeLists.txt | 365 + lib/yamlcpp/CONTRIBUTING.md | 26 + lib/yamlcpp/LICENSE | 19 + lib/yamlcpp/Makefile.am | 66 + lib/yamlcpp/README.md | 51 + lib/yamlcpp/include/yaml-cpp/anchor.h | 17 + lib/yamlcpp/include/yaml-cpp/binary.h | 67 + lib/yamlcpp/include/yaml-cpp/contrib/anchordict.h | 39 + .../include/yaml-cpp/contrib/graphbuilder.h | 149 + lib/yamlcpp/include/yaml-cpp/dll.h | 33 + lib/yamlcpp/include/yaml-cpp/emitfromevents.h | 57 + lib/yamlcpp/include/yaml-cpp/emitter.h | 254 + lib/yamlcpp/include/yaml-cpp/emitterdef.h | 16 + lib/yamlcpp/include/yaml-cpp/emittermanip.h | 137 + lib/yamlcpp/include/yaml-cpp/emitterstyle.h | 16 + lib/yamlcpp/include/yaml-cpp/eventhandler.h | 40 + lib/yamlcpp/include/yaml-cpp/exceptions.h | 267 + lib/yamlcpp/include/yaml-cpp/mark.h | 29 + lib/yamlcpp/include/yaml-cpp/node/convert.h | 331 + .../include/yaml-cpp/node/detail/bool_type.h | 26 + lib/yamlcpp/include/yaml-cpp/node/detail/impl.h | 185 + .../include/yaml-cpp/node/detail/iterator.h | 92 + .../include/yaml-cpp/node/detail/iterator_fwd.h | 27 + lib/yamlcpp/include/yaml-cpp/node/detail/memory.h | 46 + lib/yamlcpp/include/yaml-cpp/node/detail/node.h | 169 + .../include/yaml-cpp/node/detail/node_data.h | 127 + .../include/yaml-cpp/node/detail/node_iterator.h | 180 + .../include/yaml-cpp/node/detail/node_ref.h | 98 + lib/yamlcpp/include/yaml-cpp/node/emit.h | 32 + lib/yamlcpp/include/yaml-cpp/node/impl.h | 448 + lib/yamlcpp/include/yaml-cpp/node/iterator.h | 31 + lib/yamlcpp/include/yaml-cpp/node/node.h | 145 + lib/yamlcpp/include/yaml-cpp/node/parse.h | 78 + lib/yamlcpp/include/yaml-cpp/node/ptr.h | 29 + lib/yamlcpp/include/yaml-cpp/node/type.h | 16 + lib/yamlcpp/include/yaml-cpp/noncopyable.h | 25 + lib/yamlcpp/include/yaml-cpp/null.h | 26 + lib/yamlcpp/include/yaml-cpp/ostream_wrapper.h | 72 + lib/yamlcpp/include/yaml-cpp/parser.h | 86 + lib/yamlcpp/include/yaml-cpp/stlemitter.h | 51 + lib/yamlcpp/include/yaml-cpp/traits.h | 103 + lib/yamlcpp/include/yaml-cpp/yaml.h | 24 + lib/yamlcpp/install.txt | 24 + lib/yamlcpp/src/binary.cpp | 93 + lib/yamlcpp/src/collectionstack.h | 39 + lib/yamlcpp/src/contrib/graphbuilder.cpp | 17 + lib/yamlcpp/src/contrib/graphbuilderadapter.cpp | 94 + lib/yamlcpp/src/contrib/graphbuilderadapter.h | 79 + lib/yamlcpp/src/convert.cpp | 75 + lib/yamlcpp/src/directives.cpp | 22 + lib/yamlcpp/src/directives.h | 29 + lib/yamlcpp/src/emit.cpp | 25 + lib/yamlcpp/src/emitfromevents.cpp | 119 + lib/yamlcpp/src/emitter.cpp | 911 ++ lib/yamlcpp/src/emitterstate.cpp | 365 + lib/yamlcpp/src/emitterstate.h | 203 + lib/yamlcpp/src/emitterutils.cpp | 483 + lib/yamlcpp/src/emitterutils.h | 50 + lib/yamlcpp/src/exceptions.cpp | 31 + lib/yamlcpp/src/exp.cpp | 136 + lib/yamlcpp/src/exp.h | 222 + lib/yamlcpp/src/indentation.h | 41 + lib/yamlcpp/src/memory.cpp | 26 + lib/yamlcpp/src/node.cpp | 12 + lib/yamlcpp/src/node_data.cpp | 300 + lib/yamlcpp/src/nodebuilder.cpp | 130 + lib/yamlcpp/src/nodebuilder.h | 70 + lib/yamlcpp/src/nodeevents.cpp | 101 + lib/yamlcpp/src/nodeevents.h | 64 + lib/yamlcpp/src/null.cpp | 10 + lib/yamlcpp/src/ostream_wrapper.cpp | 57 + lib/yamlcpp/src/parse.cpp | 72 + lib/yamlcpp/src/parser.cpp | 129 + lib/yamlcpp/src/ptr_vector.h | 43 + lib/yamlcpp/src/regex_yaml.cpp | 45 + lib/yamlcpp/src/regex_yaml.h | 87 + lib/yamlcpp/src/regeximpl.h | 186 + lib/yamlcpp/src/scanner.cpp | 386 + lib/yamlcpp/src/scanner.h | 190 + lib/yamlcpp/src/scanscalar.cpp | 250 + lib/yamlcpp/src/scanscalar.h | 63 + lib/yamlcpp/src/scantag.cpp | 81 + lib/yamlcpp/src/scantag.h | 19 + lib/yamlcpp/src/scantoken.cpp | 437 + lib/yamlcpp/src/setting.h | 95 + lib/yamlcpp/src/simplekey.cpp | 128 + lib/yamlcpp/src/singledocparser.cpp | 414 + lib/yamlcpp/src/singledocparser.h | 65 + lib/yamlcpp/src/stream.cpp | 448 + lib/yamlcpp/src/stream.h | 76 + lib/yamlcpp/src/streamcharsource.h | 48 + lib/yamlcpp/src/stringsource.h | 48 + lib/yamlcpp/src/tag.cpp | 49 + lib/yamlcpp/src/tag.h | 33 + lib/yamlcpp/src/token.h | 69 + lib/yamlcpp/test/CMakeLists.txt | 44 + lib/yamlcpp/test/create-emitter-tests.py | 211 + lib/yamlcpp/test/handler_test.h | 32 + lib/yamlcpp/test/integration/emitter_test.cpp | 1038 +++ lib/yamlcpp/test/integration/encoding_test.cpp | 182 + lib/yamlcpp/test/integration/gen_emitter_test.cpp | 9759 ++++++++++++++++++++ lib/yamlcpp/test/integration/handler_spec_test.cpp | 1611 ++++ lib/yamlcpp/test/integration/handler_test.cpp | 76 + lib/yamlcpp/test/integration/load_node_test.cpp | 241 + lib/yamlcpp/test/integration/node_spec_test.cpp | 1131 +++ lib/yamlcpp/test/main.cpp | 6 + lib/yamlcpp/test/mock_event_handler.h | 26 + lib/yamlcpp/test/node/node_test.cpp | 517 ++ lib/yamlcpp/test/ostream_wrapper_test.cpp | 66 + lib/yamlcpp/test/regex_test.cpp | 177 + lib/yamlcpp/test/specexamples.h | 846 ++ lib/yamlcpp/util/CMakeLists.txt | 14 + lib/yamlcpp/util/api.cpp | 137 + lib/yamlcpp/util/parse.cpp | 61 + lib/yamlcpp/util/read.cpp | 103 + lib/yamlcpp/util/sandbox.cpp | 36 + lib/yamlcpp/yaml-cpp-config-version.cmake.in | 11 + lib/yamlcpp/yaml-cpp-config.cmake.in | 14 + lib/yamlcpp/yaml-cpp.pc.cmake | 11 + mgmt/LocalManager.cc | 8 +- mgmt/LocalManager.h | 4 +- mgmt/RecordsConfig.cc | 2 +- mgmt/api/APITestCliRemote.cc | 4 - mgmt/api/CoreAPI.cc | 13 +- mgmt/api/CoreAPI.h | 4 +- mgmt/api/CoreAPIRemote.cc | 6 +- mgmt/api/GenericParser.cc | 940 -- mgmt/api/GenericParser.h | 319 - mgmt/api/INKMgmtAPI.cc | 8 +- mgmt/api/Makefile.am | 2 - mgmt/api/NetworkMessage.cc | 12 +- mgmt/api/TSControlMain.cc | 5 +- mgmt/api/include/mgmtapi.h | 63 +- plugins/Makefile.am | 2 + plugins/background_fetch/background_fetch.cc | 2 +- plugins/background_fetch/configs.cc | 26 + plugins/background_fetch/configs.h | 2 + plugins/background_fetch/rules.cc | 55 +- plugins/background_fetch/rules.h | 2 +- plugins/experimental/fq_pacing/fq_pacing.c | 4 +- plugins/experimental/ssl_cert_loader/ats-util.h | 62 - .../stale_while_revalidate.c | 3 +- plugins/header_rewrite/header_rewrite.cc | 2 +- proxy/CompletionUtil.h | 44 - proxy/HostStatus.h | 8 +- proxy/InkAPI-ensure-funcs-present.pl | 49 - proxy/InkAPIInternal.h | 12 +- proxy/InkAPITestTool.cc | 1104 --- proxy/Makefile.am | 234 +- proxy/ParentConsistentHash.cc | 155 +- proxy/ParentConsistentHash.h | 1 + proxy/ParentSelection.cc | 223 +- proxy/ParentSelection.h | 4 + proxy/PluginVC.cc | 3 - proxy/Prefetch.cc | 2223 ----- proxy/Prefetch.h | 432 - proxy/StufferUdpReceiver.cc | 336 - proxy/TestClock.cc | 46 - proxy/TestDNS.cc | 253 - proxy/TestPreProc.cc | 180 - proxy/TestRegex.cc | 30 - proxy/TestSimpleProxy.cc | 160 - proxy/UDPAPIClientTest.cc | 110 - proxy/UDPAPITest.cc | 124 - proxy/UDPAPITest.h | 29 - proxy/UnixCompletionUtil.h | 102 - proxy/api/ts/experimental.h | 4 - proxy/api/ts/ts.h | 19 +- proxy/config/logging.config.default | 233 +- proxy/hdrs/HdrToken.cc | 1 - proxy/hdrs/MIME.h | 3 + proxy/http/HttpProxyServerMain.cc | 5 +- proxy/http/HttpProxyServerMain.h | 1 - proxy/http/HttpSM.cc | 80 +- proxy/http/HttpSM.h | 18 - proxy/http/HttpTransact.cc | 1 - proxy/http/HttpTransact.h | 12 +- proxy/http/test_socket_close.cc | 1 - proxy/http2/Http2ConnectionState.h | 3 + proxy/ink_icon.ico | Bin 3774 -> 0 bytes proxy/logging/LogAccessHttp.cc | 19 +- proxy/logging/LogBindings.cc | 509 - proxy/logging/LogBindings.h | 30 - proxy/logging/LogConfig.cc | 34 +- proxy/logging/LogConfig.h | 4 + proxy/logging/LogField.cc | 4 +- proxy/logging/LogField.h | 2 +- proxy/logging/LogFilter.cc | 2 +- proxy/logging/LogFilter.h | 2 +- proxy/logging/Makefile.am | 12 +- proxy/logging/YamlLogConfig.cc | 247 + .../YamlLogConfig.h} | 29 +- proxy/logging/YamlLogConfigDecoders.cc | 118 + .../YamlLogConfigDecoders.h} | 38 +- proxy/regression.pl | 166 - {lib/bindings => src}/Makefile.am | 38 +- {cmd => src}/traffic_cache_tool/CacheDefs.cc | 0 {cmd => src}/traffic_cache_tool/CacheDefs.h | 0 {cmd => src}/traffic_cache_tool/CacheScan.cc | 119 +- {cmd => src}/traffic_cache_tool/CacheScan.h | 3 +- {cmd => src}/traffic_cache_tool/CacheStore.h | 0 {cmd => src}/traffic_cache_tool/CacheTool.cc | 0 {cmd => src}/traffic_cache_tool/Command.cc | 0 {cmd => src}/traffic_cache_tool/Command.h | 0 {cmd => src}/traffic_cache_tool/File.cc | 0 {cmd => src}/traffic_cache_tool/File.h | 0 src/traffic_cache_tool/Makefile.inc | 51 + .../traffic_crashlog/Makefile.inc | 39 +- {cmd => src}/traffic_crashlog/procinfo.cc | 0 {cmd => src}/traffic_crashlog/traffic_crashlog.cc | 0 {cmd => src}/traffic_crashlog/traffic_crashlog.h | 0 .../Makefile.am => src/traffic_ctl/Makefile.inc | 42 +- {cmd => src}/traffic_ctl/alarm.cc | 0 {cmd => src}/traffic_ctl/config.cc | 0 {cmd => src}/traffic_ctl/host.cc | 13 +- {cmd => src}/traffic_ctl/metric.cc | 0 {cmd => src}/traffic_ctl/plugin.cc | 0 {cmd => src}/traffic_ctl/server.cc | 0 {cmd => src}/traffic_ctl/storage.cc | 0 {cmd => src}/traffic_ctl/traffic_ctl.cc | 0 {cmd => src}/traffic_ctl/traffic_ctl.h | 0 .../Makefile.am => src/traffic_layout/Makefile.inc | 45 +- src/traffic_layout/README | 5 + {cmd => src}/traffic_layout/engine.cc | 54 +- {cmd => src}/traffic_layout/engine.h | 10 +- {cmd => src}/traffic_layout/file_system.cc | 73 +- {cmd => src}/traffic_layout/file_system.h | 2 +- {cmd => src}/traffic_layout/info.cc | 0 {cmd => src}/traffic_layout/info.h | 0 {cmd => src}/traffic_layout/traffic_layout.cc | 0 .../Makefile.am => src/traffic_logcat/Makefile.inc | 42 +- {proxy => src/traffic_logcat}/logcat.cc | 0 .../traffic_logstats/Makefile.inc | 45 +- {proxy => src/traffic_logstats}/logstats.cc | 0 .../traffic_logstats}/tests/logstats.blog | Bin .../traffic_logstats}/tests/logstats.json | 0 .../traffic_logstats}/tests/logstats.summary | 0 .../traffic_logstats}/tests/test_logstats_json | 4 +- .../traffic_logstats}/tests/test_logstats_summary | 4 +- {cmd => src}/traffic_manager/AddConfigFilesHere.cc | 0 .../traffic_manager/Makefile.inc | 56 +- {cmd => src}/traffic_manager/traffic_manager.cc | 0 .../Makefile.am => src/traffic_quic/Makefile.inc | 28 +- {cmd => src}/traffic_quic/diags.h | 0 {cmd => src}/traffic_quic/quic_client.cc | 0 {cmd => src}/traffic_quic/quic_client.h | 0 {cmd => src}/traffic_quic/traffic_quic.cc | 0 {proxy => src/traffic_server}/CoreUtils.cc | 0 {proxy => src/traffic_server}/CoreUtils.h | 0 {proxy => src/traffic_server}/Crash.cc | 0 {proxy => src/traffic_server}/EventName.cc | 0 {proxy => src/traffic_server}/EventName.h | 0 {proxy => src/traffic_server}/FetchSM.cc | 0 {proxy => src/traffic_server}/FetchSM.h | 0 {proxy => src/traffic_server}/HostStatus.cc | 75 +- {proxy => src/traffic_server}/InkAPI.cc | 122 +- {proxy => src/traffic_server}/InkAPITest.cc | 1092 ++- {proxy => src/traffic_server}/InkIOCoreAPI.cc | 0 src/traffic_server/Makefile.inc | 100 + {proxy => src/traffic_server}/SocksProxy.cc | 0 .../traffic_server/traffic_server.cc | 13 +- .../Makefile.am => src/traffic_top/Makefile.inc | 20 +- {cmd => src}/traffic_top/README | 0 {cmd => src}/traffic_top/stats.h | 0 {cmd => src}/traffic_top/traffic_top.cc | 0 .../Makefile.am => src/traffic_via/Makefile.inc | 25 +- {cmd => src}/traffic_via/test_traffic_via | 0 .../traffic_via/tests/[u c s f p eS;tNc p s ] | 0 .../traffic_via/tests/[uIcRs f p eN;t cCH p s ] | 0 .../traffic_via/tests/[uIcRs f p eN;t cCN p s ] | 0 .../traffic_via/tests/[uScMsSf pSeN;t cCM p sS] | 0 .../traffic_via/tests/[uScRs f p eN;t cCH p s ] | 0 .../traffic_via/tests/long rubbish via code 2 | 0 {cmd => src}/traffic_via/tests/rubbish | 0 {cmd => src}/traffic_via/tests/short | 0 {cmd => src}/traffic_via/traffic_via.cc | 0 .../Makefile.am => src/traffic_wccp/Makefile.inc | 34 +- {cmd => src}/traffic_wccp/readme.txt | 0 .../traffic_wccp/service-nogre-example.config | 0 {cmd => src}/traffic_wccp/wccp_client.cc | 0 tests/gold_tests/cache/gold/cache_no_cache.gold | 2 +- tests/gold_tests/h2/httpbin.test.py | 15 +- tests/gold_tests/logging/ccid_ctid.test.py | 16 +- tests/gold_tests/logging/custom-log.test.py | 16 +- tests/gold_tests/logging/log-field.test.py | 13 +- tests/gold_tests/runroot/runroot_init.test.py | 26 + tools/jtest/jtest.cc | 3 - tools/package/trafficserver.spec | 21 +- 596 files changed, 32531 insertions(+), 125045 deletions(-) diff --cc .gitignore index 2f58694,eb51aad..8301874 --- a/.gitignore +++ b/.gitignore @@@ -49,16 -49,18 +49,19 @@@ doc/xml MYMETA.* pm_to_blib - cmd/traffic_cop/traffic_cop - cmd/traffic_ctl/traffic_ctl - cmd/traffic_crashlog/traffic_crashlog - cmd/traffic_top/traffic_top - cmd/traffic_manager/traffic_manager - cmd/traffic_layout/traffic_layout - cmd/traffic_via/traffic_via - cmd/traffic_wccp/traffic_wccp - cmd/traffic_cache_tool/traffic_cache_tool + src/traffic_cache_tool/traffic_cache_tool + src/traffic_cop/traffic_cop + src/traffic_crashlog/traffic_crashlog + src/traffic_ctl/traffic_ctl + src/traffic_layout/traffic_layout + src/traffic_logcat/traffic_logcat + src/traffic_logstats/traffic_logstats + src/traffic_manager/traffic_manager +cmd/traffic_quic/traffic_quic + src/traffic_server/traffic_server + src/traffic_top/traffic_top + src/traffic_via/traffic_via + src/traffic_wccp/traffic_wccp lib/stamp-h1 lib/ink_autoconf.h diff --cc lib/ts/ink_inet.cc index 684f194,ec4d7dc..6a6366b --- a/lib/ts/ink_inet.cc +++ b/lib/ts/ink_inet.cc @@@ -50,9 -49,10 +50,11 @@@ const std::string_view IP_PROTO_TAG_TLS const std::string_view IP_PROTO_TAG_HTTP_0_9("http/0.9"sv); const std::string_view IP_PROTO_TAG_HTTP_1_0("http/1.0"sv); const std::string_view IP_PROTO_TAG_HTTP_1_1("http/1.1"sv); -const std::string_view IP_PROTO_TAG_HTTP_2_0("h2"sv); // HTTP/2 over TLS +const std::string_view IP_PROTO_TAG_HTTP_2_0("h2"sv); // HTTP/2 over TLS +const std::string_view IP_PROTO_TAG_HTTP_QUIC("hq-12"sv); // HTTP over QUIC + const std::string_view UNIX_PROTO_TAG{"unix"sv}; + uint32_t ink_inet_addr(const char *s) { diff --cc proxy/Makefile.am index c49f457,c6fe8ac..0073483 --- a/proxy/Makefile.am +++ b/proxy/Makefile.am @@@ -18,28 -18,15 +18,20 @@@ include $(top_srcdir)/build/tidy.mk - # Note that hdrs is targeted from ../Makefile.am - SUBDIRS = http http2 logging config + SUBDIRS = hdrs shared http http2 logging config +if ENABLE_QUIC +SUBDIRS += hq +endif - noinst_LIBRARIES = - bin_PROGRAMS = \ - traffic_server \ - traffic_logcat \ - traffic_logstats - - TESTS = \ - tests/test_logstats_json \ - tests/test_logstats_summary + noinst_LIBRARIES = libproxy.a AM_CPPFLAGS += \ $(iocore_include_dirs) \ + -I$(abs_top_srcdir)/lib \ -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 \ diff --cc src/Makefile.am index eef61e3,5fc1b2e..fad11d8 --- a/src/Makefile.am +++ b/src/Makefile.am @@@ -18,21 -17,27 +17,31 @@@ include $(top_srcdir)/build/tidy.mk - AM_CPPFLAGS += \ - $(LUAJIT_CPPFLAGS) \ - -I$(abs_top_srcdir)/lib \ - -I$(abs_top_srcdir)/lib/records \ - $(TS_INCLUDES) + bin_PROGRAMS = + check_PROGRAMS = + TESTS = - noinst_LTLIBRARIES = libbindings.la + include traffic_cache_tool/Makefile.inc + include traffic_via/Makefile.inc + include traffic_top/Makefile.inc + include traffic_manager/Makefile.inc + include traffic_server/Makefile.inc + include traffic_logstats/Makefile.inc + include traffic_crashlog/Makefile.inc + include traffic_ctl/Makefile.inc + include traffic_layout/Makefile.inc + include traffic_logcat/Makefile.inc - libbindings_la_SOURCES = \ - bindings.cc \ - bindings.h \ - lua.cc \ - lua.h \ - repl.cc \ - repl.h + if BUILD_WCCP + include traffic_wccp/Makefile.inc + endif + ++if ENABLE_QUIC ++include traffic_quic/Makefile.inc ++endif ++ + TESTS += \ + $(check_PROGRAMS) clang-tidy-local: $(DIST_SOURCES) $(CXX_Clang_Tidy) diff --cc src/traffic_quic/Makefile.inc index 9876c69,0000000..be83416 mode 100644,000000..100644 --- a/src/traffic_quic/Makefile.inc +++ b/src/traffic_quic/Makefile.inc @@@ -1,62 -1,0 +1,56 @@@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + - bin_PROGRAMS = traffic_quic ++bin_PROGRAMS += traffic_quic/traffic_quic + - AM_CPPFLAGS += \ ++traffic_quic_traffic_quic_CPPFLAGS = \ ++ $(AM_CPPFLAGS) \ + $(iocore_include_dirs) \ + -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 \ + -I$(abs_top_srcdir)/proxy/hdrs \ + -I$(abs_top_srcdir)/proxy/http \ + -I$(abs_top_srcdir)/proxy/logging \ + -I$(abs_top_srcdir)/proxy/shared \ + $(TS_INCLUDES) \ + @OPENSSL_INCLUDES@ + - traffic_quic_CPPFLAGS = \ - $(AM_CPPFLAGS) ++traffic_quic_traffic_quic_LDFLAGS = \ ++ $(AM_LDFLAGS) \ ++ @OPENSSL_LDFLAGS@ + - traffic_quic_LDFLAGS = \ - @AM_LDFLAGS@ ++traffic_quic_traffic_quic_SOURCES = \ ++ traffic_quic/quic_client.cc \ ++ traffic_quic/traffic_quic.cc + - traffic_quic_SOURCES = \ - quic_client.cc \ - traffic_quic.cc - - traffic_quic_LDADD = \ ++traffic_quic_traffic_quic_LDADD = \ + $(top_builddir)/iocore/aio/libinkaio.a \ + $(top_builddir)/iocore/net/libinknet.a \ + $(top_builddir)/iocore/net/quic/libquic.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)/lib/tsconfig/libtsconfig.la \ - $(top_builddir)/lib/luajit/src/libluajit.a \ + $(top_builddir)/proxy/ParentSelectionStrategy.o \ + @LIBTCL@ \ + @HWLOC_LIBS@ \ ++ @LIB_YAMLCPP@ \ + @OPENSSL_LIBS@ - - include $(top_srcdir)/build/tidy.mk - - tidy-local: $(DIST_SOURCES) - $(CXX_Clang_Tidy) diff --cc src/traffic_quic/diags.h index 21c4e73,0000000..21c4e73 mode 100644,000000..100644 --- a/src/traffic_quic/diags.h +++ b/src/traffic_quic/diags.h diff --cc src/traffic_quic/quic_client.cc index 119b9c3,0000000..119b9c3 mode 100644,000000..100644 --- a/src/traffic_quic/quic_client.cc +++ b/src/traffic_quic/quic_client.cc diff --cc src/traffic_quic/quic_client.h index 0e3e534,0000000..0e3e534 mode 100644,000000..100644 --- a/src/traffic_quic/quic_client.h +++ b/src/traffic_quic/quic_client.h diff --cc src/traffic_quic/traffic_quic.cc index ec81a45,0000000..ec81a45 mode 100644,000000..100644 --- a/src/traffic_quic/traffic_quic.cc +++ b/src/traffic_quic/traffic_quic.cc diff --cc src/traffic_server/Makefile.inc index 0000000,b264afd..c31ca65 mode 000000,100644..100644 --- a/src/traffic_server/Makefile.inc +++ b/src/traffic_server/Makefile.inc @@@ -1,0 -1,93 +1,100 @@@ + # + # Makefile.am for the Enterprise Management module. + # + # Licensed to the Apache Software Foundation (ASF) under one + # or more contributor license agreements. See the NOTICE file + # distributed with this work for additional information + # regarding copyright ownership. The ASF licenses this file + # to you under the Apache License, Version 2.0 (the + # "License"); you may not use this file except in compliance + # with the License. You may obtain a copy of the License at + # + # http://www.apache.org/licenses/LICENSE-2.0 + # + # Unless required by applicable law or agreed to in writing, software + # distributed under the License is distributed on an "AS IS" BASIS, + # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + # See the License for the specific language governing permissions and + # limitations under the License. + + bin_PROGRAMS += traffic_server/traffic_server + + traffic_server_traffic_server_CPPFLAGS = \ + $(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/http \ + -I$(abs_top_srcdir)/proxy/http2 \ ++ -I$(abs_top_srcdir)/proxy/hq \ + -I$(abs_top_srcdir)/proxy/logging \ + -I$(abs_top_srcdir)/proxy/http/remap \ + -I$(abs_top_srcdir)/proxy/hdrs \ + -I$(abs_top_srcdir)/proxy/shared \ + -I$(abs_top_srcdir)/mgmt \ + -I$(abs_top_srcdir)/mgmt/utils \ + $(TS_INCLUDES) \ + @OPENSSL_INCLUDES@ + + traffic_server_traffic_server_SOURCES = \ + traffic_server/CoreUtils.cc \ + traffic_server/CoreUtils.h \ + traffic_server/Crash.cc \ + traffic_server/EventName.cc \ + traffic_server/EventName.h \ + traffic_server/FetchSM.cc \ + traffic_server/FetchSM.h \ + traffic_server/HostStatus.cc \ + traffic_server/InkAPI.cc \ + traffic_server/InkIOCoreAPI.cc \ + traffic_server/SocksProxy.cc \ + traffic_server/traffic_server.cc + + if BUILD_TESTS + traffic_server_traffic_server_SOURCES += \ + traffic_server/InkAPITest.cc + endif + + traffic_server_traffic_server_LDADD = \ + $(top_builddir)/proxy/http/libhttp.a \ + $(top_builddir)/proxy/http/remap/libhttp_remap.a \ + $(top_builddir)/proxy/http/remap/libhttp_remap.a \ + $(top_builddir)/proxy/http2/libhttp2.a \ + $(top_builddir)/proxy/logging/liblogging.a \ + $(top_builddir)/proxy/logging/liblogcollation.a \ + $(top_builddir)/proxy/hdrs/libhdrs.a \ + $(top_builddir)/proxy/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)/proxy/libproxy.a + ++if ENABLE_QUIC ++traffic_server_traffic_server_LDADD += \ ++ $(top_builddir)/iocore/net/quic/libquic.a \ ++ $(top_builddir)/proxy/hq/libhq.a ++endif ++ + # ToDo: When we remove this, we hould merge the two _LDADD rules here + traffic_server_traffic_server_LDADD += \ + $(top_builddir)/iocore/net/libinknet.a \ + $(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@ \ + @LIB_YAMLCPP@ \ + -lm
