diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d5c3ca360..3634127707 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - Update traffic_portal dependencies to mitigate `npm audit` issues. - Fixed a cdn-in-a-box build issue when using `RHEL_VERSION=7` - [#6549](https://github.com/apache/trafficcontrol/issues/6549) Fixed internal server error while deleting a delivery service created from a DSR (Traafic Ops). +- [#6538](https://github.com/apache/trafficcontrol/pull/6538) Fixed the incorrect use of secure.port on TrafficRouter and corrected to the httpsPort value from the TR server configuration. ### Removed - Remove traffic_portal dependencies to mitigate `npm audit` issues, specifically `grunt-concurrent`, `grunt-contrib-concat`, `grunt-contrib-cssmin`, `grunt-contrib-jsmin`, `grunt-contrib-uglify`, `grunt-contrib-htmlmin`, `grunt-newer`, and `grunt-wiredep` diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/LanguidState.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/LanguidState.java index eb668136dd..d84bb03636 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/LanguidState.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/LanguidState.java @@ -83,8 +83,8 @@ private void initPorts(final JsonNode routerJson) { trafficRouterManager.setApiPort(apiPort); } - if (routerJson.has("secure.port")) { - setSecurePort(routerJson.get("secure.port").asInt()); + if (routerJson.hasNonNull("httpsPort")) { + setSecurePort(routerJson.get("httpsPort").asInt()); } if (routerJson.has("secure.api.port")) {