Changeset 2306

Timestamp:

6/26/2011 12:30:37 AM (2 years ago)

Author:

lowjoel

Message:

Merged revision(s) 2305 from branches/eraser6/6.0:
Supplant r2304 for future versions of Eraser were we may not want to buffer our output to include the content-length header.

Location:

trunk/eraser

Files:

• . (modified) (1 prop)
• Eraser/UpdateForm.cs (modified) (2 diffs)

trunk/eraser/Eraser/UpdateForm.cs

@@ -538 +538 @@
             {
                 Util.ProgressManager progress = new Util.ProgressManager();
-                progress.Total = response.ContentLength;
+                if (response.ContentLength == -1)
+                    progress.MarkIndeterminate();
+                else
+                    progress.Total = response.ContentLength;
 
                 //Download the response
@@ -546 +549 @@
                 {
                     memoryStream.Write(buffer, 0, lastRead);
-                    progress.Completed = memoryStream.Position;
+                    if (!progress.ProgressIndeterminate)
+                        progress.Completed = memoryStream.Position;
+                    
                     if (handler != null)
                         handler(null, new Eraser.Util.ProgressChangedEventArgs(progress,