← Back to branch summary

~ubuntu-branches/ubuntu/utopic/xulrunner-1.9/utopic

« back to all changes in this revision

Viewing changes to mozilla/uriloader/base/nsDocLoader.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alexander Sack, Alexander Sack, Fabien Tassin
  • Date: 2009-02-05 09:12:37 UTC
  • mfrom: (1.1.16 upstream)
  • Revision ID: james.westby@ubuntu.com-20090205091237-2uu65i47p00yi2xk
Tags: 1.9.0.6+nobinonly-0ubuntu1
https://launchpad.net/bugs/303940
[ Alexander Sack <asac@ubuntu.com> ]
* new security/stability update v1.9.0.6 (FIREFOX_3_0_6_RELEASE)
  - see USN-717-1
* adjust patches to changed code base
  - update debian/patches/dom_inspector_support_for_prism.patch

[ Fabien Tassin <fta@ubuntu.com> ]
* Fix preinst script to better handle the /etc/gre.d clean-up
  - update debian/xulrunner-1.9.preinst.in
* Fix permissions in the -dev package (LP: #303940)
  - update debian/rules

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/uriloader/base/nsDocLoader.cpp
1487
1487
{
1488
1488
  if (aOldChannel)
1489
1489
  {
1490
 
    nsresult rv;
1491
 
    nsCOMPtr<nsIURI> oldURI, newURI;
1492
 
 
1493
 
    rv = aOldChannel->GetOriginalURI(getter_AddRefs(oldURI));
1494
 
    if (NS_FAILED(rv)) return rv;
1495
 
 
1496
 
    rv = aNewChannel->GetURI(getter_AddRefs(newURI));
1497
 
    if (NS_FAILED(rv)) return rv;
1498
 
 
1499
1490
    nsLoadFlags loadFlags = 0;
1500
1491
    PRInt32 stateFlags = nsIWebProgressListener::STATE_REDIRECTING |
1501
1492
                         nsIWebProgressListener::STATE_IS_REQUEST;