fixing bug 197847 - Too many network errors should pause install, not automatically cancel it. r=dveditz, rs=sspitzer

xpinstall/packager/windows/config.it

@@ -1133,7 +1133,7 @@ Error Corrupted Archives Detected AUTO mode=Setup has detected that at least one
 ;*** LOCALIZE ME BABY ***
 Error Too Many CRC Failures=Too many download failures.  Setup will cancel.  Any files already downloaded will not be deleted.  The next time Setup is run, these files will be taken into account during the download.
 ;*** LOCALIZE ME BABY ***
-Error Too Many Network Errors=Too many network errors trying to download %s.  Please retry again later.  Any files already downloaded will not be deleted.  The next time Setup is run, these files will be taken into account during the download.
+Error Too Many Network Errors=Too many network errors trying to download %s.  Setup will now Pause.  Please click Resume to retry downloading the files.
 ;*** LOCALIZE ME BABY ***
 Message Verifying Archives=Verifying integrity of archives, please wait...
 ;*** LOCALIZE ME BABY ***

xpinstall/wizard/windows/setup/setup.h

@@ -100,8 +100,8 @@ typedef int PRInt32;
 #define PREV_DLG                        2
 #define OTHER_DLG_1                     3
 
-#define MAX_CRC_FAILED_DOWNLOAD_RETRIES 3
-#define MAX_FILE_DOWNLOAD_RETRIES       3
+#define MAX_CRC_FAILED_DOWNLOAD_RETRIES 5
+#define MAX_FILE_DOWNLOAD_RETRIES       10
 
 #define STATUS_DISABLED                 0
 #define STATUS_ENABLED                  1

xpinstall/wizard/windows/setup/xpnetHook.cpp

@@ -1166,11 +1166,18 @@ int DownloadFiles(char *szInputIniFile,
         PrintError(szBuf, ERROR_CODE_HIDE);
       }
 
-      /* Set return value and break out of for() loop.
-       * We don't want to continue if there were too
-       * many network errors on any file. */
-      rv = WIZ_TOO_MANY_NETWORK_ERRORS;
-      break;
+      iFileDownloadRetries = 0; // reset the file download retries counter since
+                                // we'll be restarting the download again.
+      bDownloadInitiated = FALSE; // restart the download using new socket connection
+      CloseSocket(szProxyServer, szProxyPort);
+      --giIndex; // Decrement the file index counter because we'll be trying to
+                 // download the same file again.  We don't want to go to the next
+                 // file just yet.
+
+      /* Let's make sure we're in a paused state. */
+      /* The pause state will be unset by DownloadDlgProc(). */
+      gdwDownloadDialogStatus = CS_PAUSE;
+      PauseTheDownload(rv, &iFileDownloadRetries);
     }
     else if(bIgnoreAllNetworkErrors || iIgnoreFileNetworkError)
       rv = nsFTPConn::OK;