------------------------------------------------------------ revno: 13326 revision-id: squid3@treenet.co.nz-20140327090924-3lirjdfxgv7lqjvq parent: squid3@treenet.co.nz-20140324085306-8qtypfx4i668bsh5 committer: Amos Jeffries branch nick: trunk timestamp: Thu 2014-03-27 03:09:24 -0600 message: Better fix for rev.13324 ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20140327090924-3lirjdfxgv7lqjvq # target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: 85629009e92f72c845c2d7e7e80fd10e54580dd7 # timestamp: 2014-03-27 10:01:14 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # base_revision_id: squid3@treenet.co.nz-20140324085306-\ # 8qtypfx4i668bsh5 # # Begin patch === modified file 'src/client_side.cc' --- src/client_side.cc 2014-03-24 08:53:06 +0000 +++ src/client_side.cc 2014-03-27 09:09:24 +0000 @@ -2388,7 +2388,7 @@ debugs(33, 4, "request buffer full: client_request_buffer_max_size=" << Config.maxRequestBufferSize); return false; } - const SBuf::size_type wantCapacity = min(reinterpret_cast(Config.maxRequestBufferSize), haveCapacity*2); + const SBuf::size_type wantCapacity = min(static_cast(Config.maxRequestBufferSize), haveCapacity*2); buf.reserveCapacity(wantCapacity); debugs(33, 2, "growing request buffer: available=" << buf.spaceSize() << " used=" << buf.length()); }