Commit 73cca44b authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

mshtml: Use channel_bsc from URI for child documents as well.

parent fc66d0ec
......@@ -1045,22 +1045,24 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen
is_document_channel = !!(This->load_flags & LOAD_DOCUMENT_URI);
if(is_document_channel && window == window->doc_obj->basedoc.window) {
if(is_document_channel) {
if(This->uri->channel_bsc) {
channelbsc_set_channel(This->uri->channel_bsc, This, aListener, aContext);
cancel = TRUE;
}
if(window->doc_obj->mime) {
if(window == window->doc_obj->basedoc.window) {
if(!This->uri->channel_bsc) {
/* top window navigation initiated by Gecko */
nsres = before_async_open(This, window->doc_obj->nscontainer, &cancel);
if(NS_SUCCEEDED(nsres) && cancel) {
TRACE("canceled\n");
nsres = NS_BINDING_ABORTED;
}
}else if(window->doc_obj->mime) {
heap_free(This->content_type);
This->content_type = heap_strdupWtoA(window->doc_obj->mime);
}
cancel = TRUE;
}else {
nsres = before_async_open(This, window->doc_obj->nscontainer, &cancel);
if(NS_SUCCEEDED(nsres) && cancel) {
TRACE("canceled\n");
nsres = NS_BINDING_ABORTED;
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment