2003-10-11 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* HttpResponse.cs:
	* HttpServerUtility.cs: change the response writer in Execute. Thanks
	to Rich Alimi <rich@velvetsea.net> for noticing this.

svn path=/trunk/mcs/; revision=18873

diff --git a/mcs/class/System.Web/System.Web/ChangeLog b/mcs/class/System.Web/System.Web/ChangeLog
index fab7c97cdc0c905c352b9489e4596b8bc18df06a..983c11d4aa00ecc57dd1f645a0d9850e01f68853 100644 (file)
--- a/mcs/class/System.Web/System.Web/ChangeLog
+++ b/mcs/class/System.Web/System.Web/ChangeLog
@@ -1,7 +1,13 @@
 2003-10-11  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
-       * System.Web/HttpApplicationFactory.cs: support for wiring up events
-       without parameters.
+       * HttpResponse.cs:
+       * HttpServerUtility.cs: change the response writer in Execute. Thanks
+       to Rich Alimi <rich@velvetsea.net> for noticing this.
+
+2003-10-11  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * HttpApplicationFactory.cs: support for wiring up events without
+       parameters.
 
 2003-10-06  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 

diff --git a/mcs/class/System.Web/System.Web/HttpResponse.cs b/mcs/class/System.Web/System.Web/HttpResponse.cs
index dcce865f49b14ff75f2dfdccc00f7615e356ac9f..834cec264b5adce9b9fdff2ae5886ee5018b4436 100644 (file)
--- a/mcs/class/System.Web/System.Web/HttpResponse.cs
+++ b/mcs/class/System.Web/System.Web/HttpResponse.cs
@@ -590,6 +590,13 @@ namespace System.Web
                        }
                }
        
+               internal TextWriter SetTextWriter (TextWriter w)
+               {
+                       TextWriter prev = _TextWriter;
+                       _TextWriter = w;
+                       return prev;
+               }
+               
                public void BinaryWrite (byte [] buffer)
                {
                        OutputStream.Write (buffer, 0, buffer.Length);

diff --git a/mcs/class/System.Web/System.Web/HttpServerUtility.cs b/mcs/class/System.Web/System.Web/HttpServerUtility.cs
index fbd97c89ee54f01843764826b6c032a808f161e8..f4ad97386602e55ce09fe82729454085d977ec62 100644 (file)
--- a/mcs/class/System.Web/System.Web/HttpServerUtility.cs
+++ b/mcs/class/System.Web/System.Web/HttpServerUtility.cs
@@ -188,7 +188,9 @@ namespace System.Web
                                                                                               request.RequestType,
                                                                                               path,
                                                                                               filePath);
+                       TextWriter previous = null;
                        try {
+                               previous = response.SetTextWriter (output);
                                if (!(handler is IHttpAsyncHandler)) {
                                        handler.ProcessRequest (_Context);
                                } else {
@@ -200,6 +202,7 @@ namespace System.Web
                        } finally {
                                request.SetFilePath (oldFilePath);
                                request.QueryStringRaw = oldQuery;
+                               response.SetTextWriter (previous);
                        }
 
                }