See
<https://ci.trafficserver.apache.org/job/clang-format-master/1821/display/redirect?page=changes>
Changes:
[Bryan Call] Do not send HSTS header when remap has failed
------------------------------------------
[...truncated 69.95 KB...]
./plugins/generator/generator.cc
./proxy/ProtocolProbeSessionAccept.cc
./proxy/TestSimpleProxy.cc
./proxy/TestClock.cc
./proxy/Main.h
./proxy/CacheControl.h
./proxy/StufferUdpReceiver.cc
./proxy/Crash.cc
./proxy/ReverseProxy.h
./proxy/RegressionSM.h
./proxy/PluginVC.h
./proxy/logstats.cc
./proxy/TestPreProc.cc
./proxy/ControlMatcher.h
./proxy/InkAPIInternal.h
./proxy/ParentRoundRobin.h
./proxy/ReverseProxy.cc
./proxy/Main.cc
./proxy/shared/DiagsConfig.cc
./proxy/shared/UglyLogStubs.cc
./proxy/shared/DiagsConfig.h
./proxy/ParentConsistentHash.cc
./proxy/TestDNS.cc
./proxy/http2/RegressionHPACK.cc
./proxy/http2/HTTP2.h
./proxy/http2/HuffmanCodec.cc
./proxy/http2/Http2ConnectionState.cc
./proxy/http2/Http2ClientSession.cc
./proxy/http2/Http2SessionAccept.cc
./proxy/http2/Http2Stream.cc
./proxy/http2/Http2DebugNames.cc
./proxy/http2/HPACK.h
./proxy/http2/test_Huffmancode.cc
./proxy/http2/Http2ClientSession.h
./proxy/http2/HPACK.cc
./proxy/http2/HuffmanCodec.h
./proxy/http2/Http2SessionAccept.h
./proxy/http2/Http2ConnectionState.h
./proxy/http2/Http2Stream.h
./proxy/http2/Http2DebugNames.h
./proxy/http2/test_HPACK.cc
./proxy/http2/test_Http2DependencyTree.cc
./proxy/http2/HTTP2.cc
./proxy/http2/Http2DependencyTree.h
./proxy/logging/LogConfig.cc
./proxy/logging/LogUtils.cc
./proxy/logging/LogObject.h
./proxy/logging/LogBuffer.h
./proxy/logging/LogCollationBase.h
./proxy/logging/LogAccessHttp.cc
./proxy/logging/LogAccessTest.cc
./proxy/logging/LogCollationClientSM.h
./proxy/logging/LogFile.h
./proxy/logging/Log.cc
./proxy/logging/LogFilter.h
./proxy/logging/LogObject.cc
./proxy/logging/LogBindings.h
./proxy/logging/LogFieldAliasMap.cc
./proxy/logging/LogAccessTest.h
./proxy/logging/LogFilter.cc
./proxy/logging/LogBufferSink.h
./proxy/logging/LogCollationAccept.h
./proxy/logging/LogCollationClientSM.cc
./proxy/logging/LogHost.h
./proxy/logging/Log.h
./proxy/logging/LogBuffer.cc
./proxy/logging/LogField.h
./proxy/logging/LogFieldAliasMap.h
./proxy/logging/LogUtils.h
./proxy/logging/LogAccessHttp.h
./proxy/logging/LogSock.h
./proxy/logging/LogCollationHostSM.h
./proxy/logging/LogAccess.cc
./proxy/logging/LogCollationAccept.cc
./proxy/logging/LogFile.cc
./proxy/logging/LogFormat.cc
./proxy/logging/LogStandalone.cc
./proxy/logging/LogCollationHostSM.cc
./proxy/logging/LogHost.cc
./proxy/logging/LogFormat.h
./proxy/logging/LogAccess.h
./proxy/logging/LogField.cc
./proxy/logging/LogBindings.cc
./proxy/logging/LogSock.cc
./proxy/logging/LogLimits.h
./proxy/logging/test_LogUtils.cc
./proxy/logging/LogConfig.h
./proxy/UnixCompletionUtil.h
./proxy/CoreUtils.cc
./proxy/logcat.cc
./proxy/ParentRoundRobin.cc
./proxy/ParentSelectionStrategy.cc
./proxy/CompletionUtil.h
./proxy/Transform.h
./proxy/ProxyClientSession.cc
./proxy/ParentSelection.cc
./proxy/InkAPI.cc
./proxy/InkAPITest.cc
./proxy/InkIOCoreAPI.cc
./proxy/EventName.h
./proxy/StatPages.h
./proxy/UDPAPIClientTest.cc
./proxy/TransformInternal.h
./proxy/ControlMatcher.cc
./proxy/Plugin.cc
./proxy/ControlBase.h
./proxy/ParentConsistentHash.h
./proxy/EventName.cc
./proxy/UDPAPITest.h
./proxy/SocksProxy.cc
./proxy/InkAPITestTool.cc
./proxy/ProxyClientSession.h
./proxy/Prefetch.h
./proxy/Show.h
./proxy/Transform.cc
./proxy/CoreUtils.h
./proxy/IPAllow.cc
./proxy/TestPreProc.h
./proxy/IPAllow.h
./proxy/Milestones.h
./proxy/http/HttpTunnel.cc
./proxy/http/HttpSM.cc
./proxy/http/HttpConnectionCount.cc
./proxy/http/HttpCacheSM.h
./proxy/http/HttpPages.h
./proxy/http/TestUrl.cc
./proxy/http/HttpCacheSM.cc
./proxy/http/HttpUpdateTester.cc
./proxy/http/HttpTransactCache.cc
./proxy/http/HttpTunnel.h
./proxy/http/HttpServerSession.h
./proxy/http/HttpSM.h
./proxy/http/HttpTransact.cc
./proxy/http/testheaders.cc
./proxy/http/HttpDebugNames.h
./proxy/http/RegressionHttpTransact.cc
./proxy/http/remap/RemapProcessor.cc
./proxy/http/remap/RemapPluginInfo.h
./proxy/http/remap/RemapConfig.cc
./proxy/http/remap/UrlMappingPathIndex.h
./proxy/http/remap/RemapPlugins.h
./proxy/http/remap/AclFiltering.cc
./proxy/http/remap/UrlRewrite.cc
./proxy/http/remap/UrlMapping.h
./proxy/http/remap/UrlMapping.cc
./proxy/http/remap/RemapConfig.h
./proxy/http/remap/UrlRewrite.h
./proxy/http/remap/RemapPluginInfo.cc
./proxy/http/remap/RemapPlugins.cc
./proxy/http/remap/AclFiltering.h
./proxy/http/remap/UrlMappingPathIndex.cc
./proxy/http/remap/RemapProcessor.h
./proxy/http/HttpSessionAccept.h
./proxy/http/HttpConfig.cc
./proxy/http/Http1ClientSession.h
./proxy/http/HttpTransactCache.h
./proxy/http/ForwardedConfig.cc
./proxy/http/HttpSessionAccept.cc
./proxy/http/HttpProxyServerMain.cc
./proxy/http/HttpProxyServerMain.h
./proxy/http/HttpSessionManager.cc
./proxy/http/HttpPages.cc
./proxy/http/unit-tests/test_ForwardedConfig.cc
./proxy/http/unit-tests/test_ForwardedConfig_mocks.cc
./proxy/http/HttpDebugNames.cc
./proxy/http/HttpUpdateSM.h
./proxy/http/Http1ClientTransaction.h
./proxy/http/HttpBodyFactory.cc
./proxy/http/Http1ClientSession.cc
./proxy/http/test_socket_close.cc
./proxy/http/HttpProxyAPIEnums.h
./proxy/http/HttpTransactHeaders.cc
./proxy/http/HttpUpdateSM.cc
./proxy/http/HttpTransactHeaders.h
./proxy/http/Http1ClientTransaction.cc
./proxy/http/HttpConfig.h
./proxy/http/HttpBodyFactory.h
./proxy/http/HttpSessionManager.h
./proxy/http/HttpTransact.h
./proxy/http/HttpConnectionCount.h
./proxy/http/HttpServerSession.cc
./proxy/UDPAPIClientTest.h
./proxy/hdrs/test_urlhash.cc
./proxy/hdrs/HdrHeap.h
./proxy/hdrs/HdrHeap.cc
./proxy/hdrs/HdrTSOnly.cc
./proxy/hdrs/HTTP.h
./proxy/hdrs/HttpCompat.h
./proxy/hdrs/HdrToken.cc
./proxy/hdrs/HdrTest.h
./proxy/hdrs/HdrTest.cc
./proxy/hdrs/MIME.cc
./proxy/hdrs/MIME.h
./proxy/hdrs/load_http_hdr.cc
./proxy/hdrs/HTTP.cc
./proxy/hdrs/URL.h
./proxy/hdrs/test_mime.cc
./proxy/hdrs/HttpCompat.cc
./proxy/hdrs/HdrToken.h
./proxy/hdrs/URL.cc
./proxy/hdrs/HdrUtils.cc
./proxy/hdrs/HdrUtils.h
./proxy/ProtocolProbeSessionAccept.h
./proxy/ProxyClientTransaction.cc
./proxy/FetchSM.h
./proxy/FetchSM.cc
./proxy/ProxyClientTransaction.h
./proxy/ParentSelection.h
./proxy/UDPAPITest.cc
./proxy/Prefetch.cc
./proxy/TestRegex.cc
./proxy/Plugin.h
./proxy/ControlBase.cc
./proxy/CacheControl.cc
./proxy/StatPages.cc
./proxy/api/ts/experimental.h
./proxy/api/ts/ts.h
./proxy/api/ts/TsException.h
./proxy/api/ts/InkAPIPrivateIOCore.h
./proxy/api/ts/remap.h
./proxy/TimeTrace.h
./proxy/PluginVC.cc
./proxy/RegressionSM.cc
./tools/http_load/timers.c
./tools/http_load/port.h
./tools/http_load/http_load.c
./tools/http_load/timers.h
./tools/jtest/jtest.cc
./tests/tools/plugins/custom204plugin.cc
./tests/tools/plugins/ssntxnorder_verify.cc
./tests/tools/plugins/continuations_verify.cc
./tests/tools/plugins/null_transform.c
./tests/tools/plugins/ssl_hook_test.cc
./tests/gold_tests/tls/ssl-post.c
diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index 6d57d274e..bb9167b7a 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -7706,8 +7706,7 @@ HttpTransact::build_response(State *s, HTTPHdr
*base_response, HTTPHdr *outgoing
// Add HSTS header (Strict-Transport-Security) if max-age is set and the
request was https
// and the incoming request was remapped correctly
- if (s->orig_scheme == URL_WKSIDX_HTTPS &&
s->txn_conf->proxy_response_hsts_max_age >= 0 &&
- s->url_remap_success == true) {
+ if (s->orig_scheme == URL_WKSIDX_HTTPS &&
s->txn_conf->proxy_response_hsts_max_age >= 0 && s->url_remap_success == true) {
TxnDebug("http_hdrs", "hsts max-age=%" PRId64,
s->txn_conf->proxy_response_hsts_max_age);
HttpTransactHeaders::insert_hsts_header_in_response(s, outgoing_response);
}
Build step 'Execute shell' marked build as failure
