← Back to branch summary

~ubuntu-branches/ubuntu/precise/xulrunner-1.9/precise

« back to all changes in this revision

Viewing changes to mozilla/modules/libpr0n/src/imgLoader.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alexander Sack
  • Date: 2008-12-16 18:40:18 UTC
  • mfrom: (1.1.15 upstream)
  • Revision ID: james.westby@ubuntu.com-20081216184018-j646ukfhzxnjynix
Tags: 1.9.0.5+nobinonly-0ubuntu1
* new security/stability upstream release v1.9.0.5 (FIREFOX_3_0_5_RELEASE)
  - see USN-690-1
* submit patches upstreamed:
  - bzXXX_plugin_for_mimetype_pref.patch => bz449188_att350098_plugin_for_mimetype_pref.patch
  - update debian/patches/series
* adjust XULFastLoad cache in response to interleaving landing of bmo
  #453545 and #462806
  - update debian/patches/bz368428_attachment_308130.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/modules/libpr0n/src/imgLoader.cpp
493
493
        do_CreateInstance(NS_LOADGROUP_CONTRACTID);
494
494
    newChannel->SetLoadGroup(loadGroup);
495
495
 
496
 
    request->Init(aURI, loadGroup, entry, cacheId, aCX);
 
496
    request->Init(aURI, loadGroup, newChannel, entry, cacheId, aCX);
497
497
 
498
498
    // create the proxy listener
499
499
    ProxyListener *pl = new ProxyListener(static_cast<nsIStreamListener *>(request));
635
635
    // the cache should use the original URI?  See bug 89419.
636
636
    nsCOMPtr<nsIURI> originalURI;
637
637
    channel->GetOriginalURI(getter_AddRefs(originalURI));
638
 
    request->Init(originalURI, channel, entry, thread, aCX);
 
638
    request->Init(originalURI, channel, channel, entry, thread, aCX);
639
639
 
640
640
    ProxyListener *pl = new ProxyListener(static_cast<nsIStreamListener *>(request));
641
641
    if (!pl) {
963
963
  // the cache should use the original URI?  See bug 89419.
964
964
  nsCOMPtr<nsIURI> originalURI;
965
965
  channel->GetOriginalURI(getter_AddRefs(originalURI));
966
 
  request->Init(originalURI, channel, entry, NS_GetCurrentThread(), mContext);
 
966
  request->Init(originalURI, channel, channel, entry, NS_GetCurrentThread(), mContext);
967
967
 
968
968
  ProxyListener *pl = new ProxyListener(static_cast<nsIStreamListener *>(request));
969
969
  if (!pl) {