← Back to branch summary

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

« back to all changes in this revision

Viewing changes to mozilla/extensions/xforms/nsXFormsMessageElement.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/extensions/xforms/nsXFormsMessageElement.cpp
1066
1066
{
1067
1067
  NS_PRECONDITION(aNewChannel, "Redirect without a channel?");
1068
1068
 
1069
 
  nsCOMPtr<nsIURI> newURI;
 
1069
  nsCOMPtr<nsIURI> newURI, newOrigURI;
1070
1070
  nsresult rv = aNewChannel->GetURI(getter_AddRefs(newURI));
1071
1071
  NS_ENSURE_SUCCESS(rv, rv);
1072
 
  
1073
 
  if (!nsXFormsUtils::CheckConnectionAllowed(mElement, newURI)) {
 
1072
  rv = aNewChannel->GetOriginalURI(getter_AddRefs(newOrigURI));
 
1073
  NS_ENSURE_SUCCESS(rv, rv);
 
1074
 
 
1075
  if (!nsXFormsUtils::CheckConnectionAllowed(mElement, newURI) ||
 
1076
      (newOrigURI != newURI &&
 
1077
       !nsXFormsUtils::CheckConnectionAllowed(mElement, newOrigURI))) {
1074
1078
    nsAutoString tagName;
1075
1079
    mElement->GetLocalName(tagName);
1076
1080
    const PRUnichar *strings[] = { tagName.get() };