Author: mhabersack
Date: 2008-02-05 15:15:57 -0500 (Tue, 05 Feb 2008)
New Revision: 94938
Modified:
branches/mono-1-9/mcs/class/System.Web/System.Web.UI.WebControls/FileUpload.cs
branches/mono-1-9/mcs/class/System.Web/System.Web.UI/ChangeLog
Log:
backport of r94924
Modified: branches/mono-1-9/mcs/class/System.Web/System.Web.UI/ChangeLog
===================================================================
--- branches/mono-1-9/mcs/class/System.Web/System.Web.UI/ChangeLog
2008-02-05 20:13:43 UTC (rev 94937)
+++ branches/mono-1-9/mcs/class/System.Web/System.Web.UI/ChangeLog
2008-02-05 20:15:57 UTC (rev 94938)
@@ -1,3 +1,8 @@
+2008-02-05 Marek Habersack <[EMAIL PROTECTED]>
+
+ * FileUpload.cs: make sure FileContent always returns the input
+ stream positioned at the beginning. Fixes bug #35684
+
2008-02-04 Marek Habersack <[EMAIL PROTECTED]>
* SimpleWebHandlerParser.cs: use WebEncoding.FileEncoding when
Modified:
branches/mono-1-9/mcs/class/System.Web/System.Web.UI.WebControls/FileUpload.cs
===================================================================
---
branches/mono-1-9/mcs/class/System.Web/System.Web.UI.WebControls/FileUpload.cs
2008-02-05 20:13:43 UTC (rev 94937)
+++
branches/mono-1-9/mcs/class/System.Web/System.Web.UI.WebControls/FileUpload.cs
2008-02-05 20:15:57 UTC (rev 94938)
@@ -67,8 +67,13 @@
get {
if (PostedFile == null)
return Stream.Null;
- else
- return PostedFile.InputStream;
+ else {
+ Stream ret = PostedFile.InputStream;
+ if (ret != null)
+ ret.Position = 0;
+
+ return ret;
+ }
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
