------------------------------------------------------------ revno: 13938 revision-id: squid3@treenet.co.nz-20151027224511-uh1jlr4jdpfgwgnd parent: squid3@treenet.co.nz-20151027222138-1tjgi59rcf47gatq fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4188 author: Alex Rousskov committer: Amos Jeffries branch nick: 3.5 timestamp: Tue 2015-10-27 15:45:11 -0700 message: Bug 4188: Bumping intercepted SSL connections does not work on Solaris ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20151027224511-uh1jlr4jdpfgwgnd # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # testament_sha1: c9dc00529d17af61ec6bb021fe28b06435642f29 # timestamp: 2015-10-27 22:51:06 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # base_revision_id: squid3@treenet.co.nz-20151027222138-\ # 1tjgi59rcf47gatq # # Begin patch === modified file 'src/comm/ModDevPoll.cc' --- src/comm/ModDevPoll.cc 2015-01-13 09:13:49 +0000 +++ src/comm/ModDevPoll.cc 2015-10-27 22:45:11 +0000 @@ -241,6 +241,9 @@ if ( type & COMM_SELECT_READ ) { if ( handler != NULL ) { + // Hack to keep the events flowing if there is data immediately ready + if (F->flags.read_pending) + state_new |= POLLOUT; /* we want to POLLIN */ state_new |= POLLIN; } else {