From b95283c439e61533fb886ae6bb8bc9194d6b7b20 Mon Sep 17 00:00:00 2001 From: "darin%netscape.com" Date: Thu, 23 Aug 2001 18:58:25 +0000 Subject: [PATCH] backing out my patch for bug 95981 to fix blocker bug 96480 --- netwerk/base/public/nsILoadGroup.idl | 4 ---- netwerk/base/src/nsLoadGroup.cpp | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/netwerk/base/public/nsILoadGroup.idl b/netwerk/base/public/nsILoadGroup.idl index c8428c956de8..0386749baac5 100644 --- a/netwerk/base/public/nsILoadGroup.idl +++ b/netwerk/base/public/nsILoadGroup.idl @@ -44,10 +44,6 @@ interface nsILoadGroup : nsIRequest * Accesses the default load request for the group. Each time a number * of requests are added to a group, the defaultLoadRequest may be set * to indicate that all of the requests are related to a base request. - * - * The load group inherits its load flags from the default load request. - * If the default load request is NULL, then the group's load flags are - * not changed. */ attribute nsIRequest defaultLoadRequest; diff --git a/netwerk/base/src/nsLoadGroup.cpp b/netwerk/base/src/nsLoadGroup.cpp index 2844f13c714c..0cb88a9a91fb 100644 --- a/netwerk/base/src/nsLoadGroup.cpp +++ b/netwerk/base/src/nsLoadGroup.cpp @@ -388,7 +388,8 @@ nsLoadGroup::SetDefaultLoadRequest(nsIRequest *aRequest) // Inherit the group load flags from the default load request if (mDefaultLoadRequest) mDefaultLoadRequest->GetLoadFlags(&mLoadFlags); - // Else, do not change the group's load flags (see bug 95981) + else + mLoadFlags = LOAD_NORMAL; return NS_OK; }