------------------------------------------------------------ revno: 13982 revision-id: squid3@treenet.co.nz-20160215062405-u699atob39tf7uf5 parent: squid3@treenet.co.nz-20160213062427-jz0en4qyajeqpa7x author: Yuriy M. Kaminskiy committer: Amos Jeffries branch nick: 3.5 timestamp: Mon 2016-02-15 19:24:05 +1300 message: Fix mgr:config report 'qos_flows mark' output ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20160215062405-u699atob39tf7uf5 # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # testament_sha1: 08996150704e9ae437537bc4abd2b8c3e5270e00 # timestamp: 2016-02-15 06:26:17 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # base_revision_id: squid3@treenet.co.nz-20160213062427-\ # jz0en4qyajeqpa7x # # Begin patch === modified file 'src/ip/QosConfig.cc' --- src/ip/QosConfig.cc 2016-01-01 00:14:27 +0000 +++ src/ip/QosConfig.cc 2016-02-15 06:24:05 +0000 @@ -392,7 +392,7 @@ if (tosMiss > 0) { p += snprintf(p, 11, " miss=0x%02X", tosMiss); if (tosMissMask!=0xFFU) { - p += snprintf(p, 6, "/0x%02X", markMissMask); + p += snprintf(p, 6, "/0x%02X", tosMissMask); } } if (preserveMissTos == 0) {