fixes to make the web crawler work when sites which have meta-refresh tags are encountered...

webshell/tests/viewer/nsWebCrawler.cpp

@@ -218,10 +218,25 @@ nsWebCrawler::OnEndDocumentLoad(nsIDocumentLoader* loader,
                                 nsresult aStatus,
                                 nsIDocumentLoaderObserver* aObserver)
 {
+  nsresult rv;
   PRTime endLoadTime = PR_Now();
 
+  if (loader != mDocLoader) {
+    // This notifications is not for the "main" document...
+    return NS_OK;
+  }
+
+  if (NS_BINDING_ABORTED == aStatus) {
+    //
+    // Sometimes a Refresh will interrupt a document that is loading...
+    // When this happens just ignore the ABORTED notification and wait
+    // for the notification that the Refreshed document has finished..
+    //
+    return NS_OK;
+  }
+
   nsCOMPtr<nsIURI> aURL;
-  nsresult rv = channel->GetURI(getter_AddRefs(aURL));
+  rv = channel->GetURI(getter_AddRefs(aURL));
   if (NS_FAILED(rv)) {
     return rv;
   }
@@ -493,6 +508,7 @@ nsWebCrawler::Start()
   nsIWebShell* shell = nsnull;
   mBrowser->GetWebShell(shell);
   shell->SetDocLoaderObserver(this);
+  shell->GetDocumentLoader(*getter_AddRefs(mDocLoader));
   NS_RELEASE(shell);
   if (mPendingURLs.Count() > 1) {
     mHaveURLList = PR_TRUE;
@@ -767,6 +783,8 @@ nsWebCrawler::LoadNextURL(PRBool aQueueLoad)
           nsIWebShell* webShell;
           mBrowser->GetWebShell(webShell);
           if (aQueueLoad) {
+            // Call stop to cancel any pending URL Refreshes...
+///            webShell->Stop();
             QueueLoadURL(*url);
           }
           else {

webshell/tests/viewer/nsWebCrawler.h

@@ -24,6 +24,7 @@
 
 #include "nsCOMPtr.h"
 #include "nsIBrowserWindow.h"
+#include "nsIDocumentLoader.h"
 #include "nsIDocumentLoaderObserver.h"
 #include "nsVoidArray.h"
 #include "nsString.h"
@@ -155,6 +156,7 @@ protected:
 
   void PerformRegressionTest(const nsString& aOutputName);
 
+  nsCOMPtr<nsIDocumentLoader> mDocLoader;
   nsIBrowserWindow* mBrowser;
   nsViewerApp* mViewer;
   nsITimer* mTimer;