Author: mhabersack
Date: 2008-02-05 14:02:13 -0500 (Tue, 05 Feb 2008)
New Revision: 94924
Modified:
trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
trunk/mcs/class/System.Web/System.Web.UI.WebControls/FileUpload.cs
Log:
2008-02-05 Marek Habersack <[EMAIL PROTECTED]>
* FileUpload.cs: make sure FileContent always returns the input
stream positioned at the beginning. Fixes bug #356846
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2008-02-05 18:47:30 UTC (rev 94923)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2008-02-05 19:02:13 UTC (rev 94924)
@@ -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 #356846
+
2008-01-31 Igor Zelmanovich <[EMAIL PROTECTED]>
* Calendar.cs: resolve Next/Prev. month link date correctly.
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/FileUpload.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/FileUpload.cs
2008-02-05 18:47:30 UTC (rev 94923)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/FileUpload.cs
2008-02-05 19:02:13 UTC (rev 94924)
@@ -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
