From 2c59a6eb708796e489d3cf6c3e741e588921c84d Mon Sep 17 00:00:00 2001
From: "rpotts%netscape.com"
 <rpotts%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 14 Jan 1999 06:12:36 +0000
Subject: [PATCH] Add some code that was lost from nsURL.cpp OpenStream(...). 
 Use the nsIURLGroup if available to open the stream.  This allows URL loads
 to be grouped together.

git-svn-id: svn://10.0.0.236/trunk@17710 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/network/module/nsNetService.cpp | 28 ++++++++++++++++++-------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/mozilla/network/module/nsNetService.cpp b/mozilla/network/module/nsNetService.cpp
index e59d1067faa..31c2e9be211 100644
--- a/mozilla/network/module/nsNetService.cpp
+++ b/mozilla/network/module/nsNetService.cpp
@@ -42,6 +42,7 @@ extern "C" {
 #include "nsIProtocolConnection.h"
 #include "nsIProtocolURLFactory.h"
 #include "nsIProtocol.h"
+#include "nsIURLGroup.h"
 #include "nsIServiceManager.h"
 #include "nsIEventQueueService.h"
 #include "nsXPComCIID.h"
@@ -1106,16 +1107,27 @@ NS_NET nsresult NS_MakeAbsoluteURL(nsIURL* aURL,
 
 NS_NET nsresult NS_OpenURL(nsIURL* aURL, nsIStreamListener* aConsumer)
 {
-    nsINetService *inet = nsnull;
-    nsresult rv = nsServiceManager::GetService(kNetServiceCID,
-                                               kINetServiceIID,
-                                               (nsISupports **)&inet);
-    if (rv != NS_OK) return rv;
+  nsresult rv;
+  nsIURLGroup* group = nsnull;
 
-    rv = inet->OpenStream(aURL, aConsumer);
+  rv = aURL->GetURLGroup(&group);
+  if (NS_SUCCEEDED(rv)) {
+    if (nsnull != group) {
+      rv = group->OpenStream(aURL, aConsumer);
+      NS_RELEASE(group);
+    } else {
+      nsINetService *inet = nsnull;
 
-    nsServiceManager::ReleaseService(kNetServiceCID, inet);
-    return rv;
+      rv = nsServiceManager::GetService(kNetServiceCID,
+                                        kINetServiceIID,
+                                        (nsISupports **)&inet);
+      if (NS_SUCCEEDED(rv)) {
+        rv = inet->OpenStream(aURL, aConsumer);
+        nsServiceManager::ReleaseService(kNetServiceCID, inet);
+      }
+    }
+  }
+  return rv;
 }
 
 NS_NET nsresult NS_OpenURL(nsIURL* aURL, nsIInputStream* *aNewStream,