------------------------------------------------------------ revno: 12664 revision-id: squid3@treenet.co.nz-20131130090657-i3lxe25svrigl3xy parent: squid3@treenet.co.nz-20131129042532-u2ycsfmikvv0ro7k committer: Amos Jeffries branch nick: 3.3 timestamp: Sat 2013-11-30 02:06:57 -0700 message: Fix mistake in porting rev.12660 ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20131130090657-i3lxe25svrigl3xy # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # testament_sha1: 11005542625ae717c85ceea18aff953bdbe8a984 # timestamp: 2013-11-30 09:53:21 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # base_revision_id: squid3@treenet.co.nz-20131129042532-\ # u2ycsfmikvv0ro7k # # Begin patch === modified file 'src/Server.cc' --- src/Server.cc 2013-11-21 21:54:29 +0000 +++ src/Server.cc 2013-11-30 09:06:57 +0000 @@ -526,7 +526,7 @@ // adaptation may overwrite old offset computed using the virgin response const bool partial = theFinalReply->content_range && - theFinalReply->sline.status() == Http::scPartialContent; + theFinalReply->sline.status() == HTTP_PARTIAL_CONTENT; currentOffset = partial ? theFinalReply->content_range->spec.offset : 0; }