Issue 1669 - Report blocked object subrequests as failed, not as empty HTML

Issue 1669 - Report blocked object subrequests as failed, not as empty HTML

[sergei, 2014-12-08 10:13:54]

I would say we also need to set `m_blockedInTransaction` to `false` to avoid our
calls which are in `CustomSinkStartPolicy<Protocol, Sink>::OnStart` in
SinkPolicy.inl.

What do you think about renaming `m_blockedInTransaction` to something like
`m_isCustomResponse` and set it to `false` in
`WBPassthruSink::BeginningTransaction`?


-  m_blockedInTransaction = client->ShouldBlock(szURL, m_contentType,
m_boundDomain);
-  if (m_blockedInTransaction)
+  if (client->ShouldBlock(szURL, m_contentType, m_boundDomain))
   {
+    m_isCustomResponse = m_contentType != CFilter::contentTypeObjectSubrequest;
     return E_ABORT;
   }

So the logic will be only in `WBPassthruSink::BeginningTransaction`.

[sergei, 2014-12-08 10:22:08]

BTW, may be we will improve it by checking the expected request type, so even if
it's `text/html` which also can be queried by flash we can feed our custom html
response. And the best place for this logic seems to be
`WBPassthruSink::BeginningTransaction`.

[Oleksandr, 2014-12-09 10:17:44]

On 2014/12/08 10:22:08, sergei wrote:
> BTW, may be we will improve it by checking the expected request type, so even
if
> it's `text/html` which also can be queried by flash we can feed our custom
html
> response. And the best place for this logic seems to be
> `WBPassthruSink::BeginningTransaction`.

I think ideally we would have a different response type for each request type.
Images would get their own response, Javascript would have it's own. I don't
think we should make this change now, since it would require more testing.

[sergei, 2014-12-09 10:25:06]

LGTM,

I would like to keep your comment
// NOTE: Feeding custom HTML to Flash, instead of original object subrequest
// doesn't have much sense. It also can manifest in unwanted result	
// like video being blocked (See https://issues.adblockplus.org/ticket/1669)	
// So we report blocked object subrequests as failed, not just empty HTML.

before
m_isCustomResponse = m_contentType != CFilter::contentTypeObjectSubrequest;