Merge branch 'alexischr/nursery-canaries-managed-alloc'

[mono.git] / mcs / class / System.Web / System.Web / HttpResponseHeader.cs

diff --git a/mcs/class/System.Web/System.Web/HttpResponseHeader.cs b/mcs/class/System.Web/System.Web/HttpResponseHeader.cs
index ca3fdf3926629e02d8ebdb0dfef7c7b7ccc603da..574bbade505e556e0881c3c6f1ecea296e67f46f 100644 (file)
--- a/mcs/class/System.Web/System.Web/HttpResponseHeader.cs
+++ b/mcs/class/System.Web/System.Web/HttpResponseHeader.cs
@@ -1,10 +1,12 @@
-// \r
-// System.Web.HttpResponseHeader\r
-//\r
-// Author:\r
-//   Patrik Torstensson (Patrik.Torstensson@labs2.com)\r
-//\r
+//
+// System.Web.HttpResponseHeader.cs 
+//
+// Author:
+//     Chris Toshok (toshok@novell.com)
+//
 
+//
+// Copyright (C) 2005-2010 Novell, Inc (http://www.novell.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -25,49 +27,83 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-using System;\r
-\r
-namespace System.Web {\r
-   internal class HttpResponseHeader {\r
-      private string _sHeader;\r
-      private string _sValue;\r
-      private int _iKnowHeaderId;\r
-\r
-      internal HttpResponseHeader(int KnowHeaderId, string value) {\r
-         _iKnowHeaderId = KnowHeaderId;\r
-         _sValue = value;\r
-      }\r
-\r
-      internal HttpResponseHeader(string header, string value) {\r
-         _sHeader = header;\r
-         _sValue = value;\r
-      }\r
-\r
-      internal string Name {\r
-         get {\r
-            if (null == _sHeader) {\r
-               return HttpWorkerRequest.GetKnownResponseHeaderName(_iKnowHeaderId);\r
-            }\r
-\r
-            return _sHeader;\r
-         }\r
-      }\r
-\r
-      internal string Value {\r
-         get {\r
-            return _sValue;\r
-         }\r
-        set {\r
-               _sValue = value;\r
-        }\r
-      }\r
-\r
-      internal void SendContent(HttpWorkerRequest WorkerRequest) {\r
-         if (null != _sHeader) {\r
-            WorkerRequest.SendUnknownResponseHeader(_sHeader, _sValue);\r
-         } else {\r
-            WorkerRequest.SendKnownResponseHeader(_iKnowHeaderId, _sValue);\r
-         }\r
-      }\r
-   }\r
-}\r
+
+using System.Collections;
+using System.Text;
+using System.Web.Configuration;
+using System.Web.Util;
+
+namespace System.Web
+{
+       abstract class BaseResponseHeader
+       {
+               string headerValue;
+               
+               public string Value {
+                       get { return headerValue; }
+                       set {
+                               string hname, hvalue;
+                               HttpEncoder.Current.HeaderNameValueEncode (null, value, out hname, out hvalue);
+                               headerValue = hvalue;
+                       }
+               }
+/*       
+               static bool headerCheckingEnabled;
+               
+               static BaseResponseHeader ()
+               {
+                       HttpRuntimeSection section = HttpRuntime.Section;
+                       headerCheckingEnabled = section == null || section.EnableHeaderChecking;
+               }
+*/
+
+               internal BaseResponseHeader (string val)
+               {
+                       Value = val;
+               }
+               
+               internal abstract void SendContent (HttpWorkerRequest wr);
+       }
+
+       internal sealed class KnownResponseHeader : BaseResponseHeader
+       {
+               public int ID;
+
+               internal KnownResponseHeader (int ID, string val) : base (val)
+               {
+                       this.ID = ID;
+               }
+
+               internal override void SendContent (HttpWorkerRequest wr)
+               {
+                       wr.SendKnownResponseHeader (ID, Value);
+               }
+       }
+
+       internal sealed class UnknownResponseHeader : BaseResponseHeader
+       {
+               string headerName;
+               
+               public string Name {
+                       get { return headerName; }
+                       set {
+                               string hname, hvalue;
+                               HttpEncoder.Current.HeaderNameValueEncode (value, null, out hname, out hvalue);
+                               headerName = hname;
+                       }
+               }
+               
+
+               public UnknownResponseHeader (string name, string val) : base (val)
+               {
+                       Name = name;
+               }
+       
+               internal override void SendContent (HttpWorkerRequest wr)
+               {
+                       wr.SendUnknownResponseHeader (Name, Value);
+               }
+               
+       }
+}
+