2009-03-26 Marek Habersack <[email protected]>

	* HttpWorkerRequest.cs: use a generic dictionary to keep header
	names in 2.0+.
	GetKnown{Request,Response}HeaderIndex doesn't use the switch
	anymore.

	* HttpResponse.cs: WriteHeaders now checks whether a header to be
	sent is a known one or not and uses the appropriate method to send
	that header. Partial fix for bug #488702

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

mcs/class/System.Web/System.Web/ChangeLog

@@ -1,3 +1,14 @@
+2009-03-26  Marek Habersack  <[email protected]>
+
+	* HttpWorkerRequest.cs: use a generic dictionary to keep header
+	names in 2.0+.
+	GetKnown{Request,Response}HeaderIndex doesn't use the switch
+	anymore.
+
+	* HttpResponse.cs: WriteHeaders now checks whether a header to be
+	sent is a known one or not and uses the appropriate method to send
+	that header. Partial fix for bug #488702
+
 2009-03-25 Gonzalo Paniagua Javier <[email protected]>
 
 	* HttpResponse.cs: ClearHeaders() also resets cacheability.

mcs/class/System.Web/System.Web/HttpResponse.cs

@@ -784,15 +784,21 @@ namespace System.Web {
 			if (WorkerRequest != null) {
 				string header_name;
 				string[] values;
+				int header_index;
 				
 				for (int i = 0; i < write_headers.Count; i++) {
 					header_name = write_headers.GetKey (i);
+					header_index = HttpWorkerRequest.GetKnownResponseHeaderIndex (header_name);
 					values = write_headers.GetValues (i);
 					if (values == null)
 						continue;
 					
-					foreach (string val in values)
-						WorkerRequest.SendUnknownResponseHeader (header_name, val);
+					foreach (string val in values) {
+						if (header_index > -1)
+							WorkerRequest.SendKnownResponseHeader (header_index, val);
+						else
+							WorkerRequest.SendUnknownResponseHeader (header_name, val);
+					}
 				}
 			}
 		}

mcs/class/System.Web/System.Web/HttpWorkerRequest.cs

@@ -34,6 +34,10 @@ using System.Security.Permissions;
 using System.Web.UI;
 using System.Collections.Specialized;
 
+#if NET_2_0
+using System.Collections.Generic;
+#endif
+
 namespace System.Web {
 
 	// CAS
@@ -106,17 +110,32 @@ namespace System.Web {
 		public const int ReasonClientDisconnect = 4;
 		public const int ReasonDefault = 0;
 
+#if NET_2_0
+		static readonly Dictionary <string, int> RequestHeaderIndexer;
+		static readonly Dictionary <string, int> ResponseHeaderIndexer;
+#else
 		static readonly Hashtable RequestHeaderIndexer;
 		static readonly Hashtable ResponseHeaderIndexer;
-
-		static HttpWorkerRequest() {
+#endif
+		
+		static HttpWorkerRequest ()
+		{
+#if NET_2_0
+			RequestHeaderIndexer = new Dictionary <string, int> (StringComparer.OrdinalIgnoreCase);
+#else
 			RequestHeaderIndexer = CollectionsUtil.CreateCaseInsensitiveHashtable(RequestHeaderMaximum);
+#endif
+			
 			for (int i = 0; i < RequestHeaderMaximum; i++)
-				RequestHeaderIndexer[GetKnownRequestHeaderName(i)] = i;
+				RequestHeaderIndexer.Add (GetKnownRequestHeaderName(i), i);
 
+#if NET_2_0
+			ResponseHeaderIndexer = new Dictionary <string, int> (StringComparer.OrdinalIgnoreCase);
+#else
 			ResponseHeaderIndexer = CollectionsUtil.CreateCaseInsensitiveHashtable(ResponseHeaderMaximum);
+#endif
 			for (int i = 0; i < ResponseHeaderMaximum; i++)
-				ResponseHeaderIndexer[GetKnownResponseHeaderName(i)] = i;
+				ResponseHeaderIndexer.Add (GetKnownResponseHeaderName(i), i);
 		}
 
 		public virtual string MachineConfigPath {
@@ -345,52 +364,15 @@ namespace System.Web {
 		
 		public static int GetKnownRequestHeaderIndex (string header)
 		{
-			switch (header){
-			case "Cache-Control": return HeaderCacheControl;
-			case "Connection": return HeaderConnection;
-			case "Date": return HeaderDate;
-			case "Keep-Alive": return HeaderKeepAlive;
-			case "Pragma": return HeaderPragma;
-			case "Trailer": return HeaderTrailer;
-			case "Transfer-Encoding": return HeaderTransferEncoding;
-			case "Upgrade": return HeaderUpgrade;
-			case "Via": return HeaderVia;
-			case "Warning": return HeaderWarning;
-			case "Allow": return HeaderAllow;
-			case "Content-Length": return HeaderContentLength;
-			case "Content-Type": return HeaderContentType;
-			case "Content-Encoding": return HeaderContentEncoding;
-			case "Content-Language": return HeaderContentLanguage;
-			case "Content-Location": return HeaderContentLocation;
-			case "Content-MD5": return HeaderContentMd5;
-			case "Content-Range": return HeaderContentRange;
-			case "Expires": return HeaderExpires;
-			case "Last-Modified": return HeaderLastModified;
-			case "Accept": return HeaderAccept;
-			case "Accept-Charset": return HeaderAcceptCharset;
-			case "Accept-Encoding": return HeaderAcceptEncoding;
-			case "Accept-Language": return HeaderAcceptLanguage;
-			case "Authorization": return HeaderAuthorization;
-			case "Cookie": return HeaderCookie;
-			case "Expect": return HeaderExpect;
-			case "From": return HeaderFrom;
-			case "Host": return HeaderHost;
-			case "If-Match": return HeaderIfMatch;
-			case "If-Modified-Since": return HeaderIfModifiedSince;
-			case "If-None-Match": return HeaderIfNoneMatch;
-			case "If-Range": return HeaderIfRange;
-			case "If-Unmodified-Since": return HeaderIfUnmodifiedSince;
-			case "Max-Forwards": return HeaderMaxForwards;
-			case "Proxy-Authorization": return HeaderProxyAuthorization;
-			case "Referer": return HeaderReferer;
-			case "Range": return HeaderRange;
-			case "TE": return HeaderTe;
-			case "User-Agent": return HeaderUserAgent;
-			}
-
+#if NET_2_0
+			int index;
+			if (RequestHeaderIndexer.TryGetValue (header, out index))
+				return index;
+#else
 			object index = RequestHeaderIndexer[header];
 			if (index != null)
 				return (int)index;
+#endif
 
 			return -1;
 		}
@@ -445,42 +427,15 @@ namespace System.Web {
 
 		public static int GetKnownResponseHeaderIndex (string header)
 		{
-			switch (header){
-			case "Cache-Control": return HeaderCacheControl;
-			case "Connection": return HeaderConnection;
-			case "Date": return HeaderDate;
-			case "Keep-Alive": return HeaderKeepAlive;
-			case "Pragma": return HeaderPragma;
-			case "Trailer": return HeaderTrailer;
-			case "Transfer-Encoding": return HeaderTransferEncoding;
-			case "Upgrade": return HeaderUpgrade;
-			case "Via": return HeaderVia;
-			case "Warning": return HeaderWarning;
-			case "Allow": return HeaderAllow;
-			case "Content-Length": return HeaderContentLength;
-			case "Content-Type": return HeaderContentType;
-			case "Content-Encoding": return HeaderContentEncoding;
-			case "Content-Language": return HeaderContentLanguage;
-			case "Content-Location": return HeaderContentLocation;
-			case "Content-MD5": return HeaderContentMd5;
-			case "Content-Range": return HeaderContentRange;
-			case "Expires": return HeaderExpires;
-			case "Last-Modified": return HeaderLastModified;
-			case "Accept-Ranges": return HeaderAcceptRanges;
-			case "Age": return HeaderAge;
-			case "ETag": return HeaderEtag;
-			case "Location": return HeaderLocation;
-			case "Proxy-Authenticate":return HeaderProxyAuthenticate;
-			case "Retry-After": return HeaderRetryAfter;
-			case "Server": return HeaderServer;
-			case "Set-Cookie": return HeaderSetCookie;
-			case "Vary": return HeaderVary;
-			case "WWW-Authenticate": return HeaderWwwAuthenticate;
-			}
-
+#if NET_2_0
+			int index;
+			if (ResponseHeaderIndexer.TryGetValue (header, out index))
+				return index;
+#else
 			object index = ResponseHeaderIndexer[header];
 			if (index != null)
 				return (int)index;
+#endif
 
 			return -1;
 		}

mcs/class/System.Web/Test/System.Web/ChangeLog

@@ -1,3 +1,11 @@
+2009-03-26  Marek Habersack  <[email protected]>
+
+	* HttpResponseTest.cs: enabled the WriteHeader test. Modified the
+	part where it checks the values of the headers - order in which
+	the headers are sent does not matter. Partial fix for bug #488702
+	FakeHttpWorkerRequest2 stores the sent (un)known headers in hash
+	tables now.
+
 2009-03-25  Gert Driesen  <[email protected]>
 
 	* HttpResponseTest.cs: Added tests for bug #485557 and #488702. 

mcs/class/System.Web/Test/System.Web/HttpResponseTest.cs

@@ -36,14 +36,14 @@ using NUnit.Framework;
 namespace MonoTests.System.Web {
 
 	public class FakeHttpWorkerRequest2 : HttpWorkerRequest {
-		public ArrayList KnownResponseHeaders;
-		public ArrayList UnknownResponseHeaders;
+		public Hashtable KnownResponseHeaders;
+		public Hashtable UnknownResponseHeaders;
 		public int return_kind;
 		
 		public FakeHttpWorkerRequest2 (int re)
 		{
-			KnownResponseHeaders = new ArrayList ();
-			UnknownResponseHeaders = new ArrayList ();
+			KnownResponseHeaders = CollectionsUtil.CreateCaseInsensitiveHashtable();
+			UnknownResponseHeaders = CollectionsUtil.CreateCaseInsensitiveHashtable();
 			return_kind = re;
 		}
 		
@@ -111,16 +111,35 @@ namespace MonoTests.System.Web {
 			status_string = x;
 		}
 
+		void AddHeader (Hashtable table, string header_name, object header)
+		{
+			object o = table [header_name];
+			if (o == null)
+				table.Add (header_name, header);
+			else {
+				ArrayList al = o as ArrayList;
+				if (al == null) {
+					al = new ArrayList ();
+					al.Add (o);
+					table [header_name] = al;
+				} else
+					al = o as ArrayList;
+				
+				al.Add (header);
+			}
+		}
+		
 		bool headers_sent;
 		public override void SendKnownResponseHeader(int x, string j)
 		{
-			KnownResponseHeaders.Add (new KnownResponseHeader (x, j));
+			string header_name = HttpWorkerRequest.GetKnownRequestHeaderName (x);
+			AddHeader (KnownResponseHeaders, header_name, new KnownResponseHeader (x, j));
 			headers_sent = true;
 		}
 		
 		public override void SendUnknownResponseHeader(string a, string b)
 		{
-			UnknownResponseHeaders.Add (new UnknownResponseHeader (a, b));
+			AddHeader (UnknownResponseHeaders, a, new UnknownResponseHeader (a, b));
 			headers_sent = true;
 		}
 
@@ -432,7 +451,6 @@ namespace MonoTests.System.Web {
 		}
 
 		[Test] // bug #488702
-		[Category ("NotWorking")]
 		public void WriteHeaders ()
 		{
 			FakeHttpWorkerRequest2 f;
@@ -459,73 +477,53 @@ namespace MonoTests.System.Web {
 			KnownResponseHeader known;
 
 			Assert.AreEqual (6, f.KnownResponseHeaders.Count, "#B1");
-			known = (KnownResponseHeader)f.KnownResponseHeaders [0];
-#if NET_2_0
+			
+			known = (KnownResponseHeader)f.KnownResponseHeaders ["Content-Length"];
 			Assert.AreEqual (HttpWorkerRequest.HeaderContentLength, known.Index, "#B2");
 			Assert.AreEqual ("40", known.Value, "#B3");
-			known = (KnownResponseHeader)f.KnownResponseHeaders[1];
+			
+			known = (KnownResponseHeader)f.KnownResponseHeaders["Transfer-Encoding"];
 			Assert.AreEqual (HttpWorkerRequest.HeaderTransferEncoding, known.Index, "#B4");
 			Assert.AreEqual ("compress", known.Value, "#B5");
-			known = (KnownResponseHeader)f.KnownResponseHeaders[2];
+			
+			known = (KnownResponseHeader)f.KnownResponseHeaders["Cache-Control"];
 			Assert.AreEqual (HttpWorkerRequest.HeaderCacheControl, known.Index, "#B6");
 			Assert.AreEqual ("no-cache", known.Value, "#B7");
-			known = (KnownResponseHeader)f.KnownResponseHeaders[3];
+			
+			known = (KnownResponseHeader)f.KnownResponseHeaders["Pragma"];
 			Assert.AreEqual (HttpWorkerRequest.HeaderPragma, known.Index, "#B8");
 			Assert.AreEqual ("no-cache", known.Value, "#B9");
-			known = (KnownResponseHeader)f.KnownResponseHeaders[4];
+			
+			known = (KnownResponseHeader)f.KnownResponseHeaders["Expires"];
 			Assert.AreEqual (HttpWorkerRequest.HeaderExpires, known.Index, "#B10");
 			Assert.AreEqual ("-1", known.Value, "#B11");
-			known = (KnownResponseHeader)f.KnownResponseHeaders[5];
+			
+			known = (KnownResponseHeader)f.KnownResponseHeaders["Content-Type"];
 			Assert.AreEqual (HttpWorkerRequest.HeaderContentType, known.Index, "#B12");
 			Assert.AreEqual ("application/ms-word", known.Value, "#B13");
-#else
-			Assert.AreEqual (HttpWorkerRequest.HeaderTransferEncoding, known.Index, "#B2");
-			Assert.AreEqual ("compress", known.Value, "#B3");
-			known = (KnownResponseHeader)f.KnownResponseHeaders [1];
-			Assert.AreEqual (HttpWorkerRequest.HeaderCacheControl, known.Index, "#B4");
-			Assert.AreEqual ("no-cache", known.Value, "#B5");
-			known = (KnownResponseHeader)f.KnownResponseHeaders [2];
-			Assert.AreEqual (HttpWorkerRequest.HeaderPragma, known.Index, "#B6");
-			Assert.AreEqual ("no-cache", known.Value, "#B7");
-			known = (KnownResponseHeader)f.KnownResponseHeaders [3];
-			Assert.AreEqual (HttpWorkerRequest.HeaderExpires, known.Index, "#B8");
-			Assert.AreEqual ("-1", known.Value, "#B9");
-			known = (KnownResponseHeader)f.KnownResponseHeaders [4];
-			Assert.AreEqual (HttpWorkerRequest.HeaderContentType, known.Index, "#B10");
-			Assert.AreEqual ("application/ms-word", known.Value, "#B11");
-			known = (KnownResponseHeader)f.KnownResponseHeaders [5];
-			Assert.AreEqual (HttpWorkerRequest.HeaderContentLength, known.Index, "#B12");
-			Assert.AreEqual ("40", known.Value, "#B13");
-#endif
 
 			UnknownResponseHeader unknown;
 
-#if NET_2_0
-			Assert.AreEqual (4, f.UnknownResponseHeaders.Count, "#C1");
-			unknown = (UnknownResponseHeader) f.UnknownResponseHeaders [0];
+			Assert.AreEqual (3, f.UnknownResponseHeaders.Count, "#C1");
+			
+			unknown = (UnknownResponseHeader) f.UnknownResponseHeaders ["X-AspNet-Version"];
 			Assert.AreEqual ("X-AspNet-Version", unknown.Name, "#C2");
 			Assert.AreEqual (Environment.Version.ToString (3), unknown.Value, "#C3");
-			unknown = (UnknownResponseHeader) f.UnknownResponseHeaders [1];
+			
+			unknown = (UnknownResponseHeader) f.UnknownResponseHeaders ["Content-Disposition"];
 			Assert.AreEqual ("Content-Disposition", unknown.Name, "#C4");
 			Assert.AreEqual ("inline", unknown.Value, "#C5");
-			unknown = (UnknownResponseHeader) f.UnknownResponseHeaders [2];
-			Assert.AreEqual ("My-Custom-Header", unknown.Name, "#C6");
-			Assert.AreEqual ("never", unknown.Value, "#C7");
-			unknown = (UnknownResponseHeader) f.UnknownResponseHeaders [3];
-			Assert.AreEqual ("My-Custom-Header", unknown.Name, "#C8");
-			Assert.AreEqual ("always", unknown.Value, "#C9");
-#else
-			Assert.AreEqual (3, f.UnknownResponseHeaders.Count, "#C1");
-			unknown = (UnknownResponseHeader) f.UnknownResponseHeaders [0];
-			Assert.AreEqual ("Content-Disposition", unknown.Name, "#C2");
-			Assert.AreEqual ("inline", unknown.Value, "#C3");
-			unknown = (UnknownResponseHeader) f.UnknownResponseHeaders [1];
-			Assert.AreEqual ("My-Custom-Header", unknown.Name, "#C4");
-			Assert.AreEqual ("never", unknown.Value, "#C5");
-			unknown = (UnknownResponseHeader) f.UnknownResponseHeaders [2];
-			Assert.AreEqual ("My-Custom-Header", unknown.Name, "#C6");
-			Assert.AreEqual ("always", unknown.Value, "#C7");
-#endif
+
+			ArrayList al = f.UnknownResponseHeaders ["My-Custom-Header"] as ArrayList;
+			Assert.AreEqual (2, al.Count, "#C6");
+			
+			unknown = (UnknownResponseHeader) al [0];
+			Assert.AreEqual ("My-Custom-Header", unknown.Name, "#C7");
+			Assert.AreEqual ("never", unknown.Value, "#C8");
+			
+			unknown = (UnknownResponseHeader) al [1];
+			Assert.AreEqual ("My-Custom-Header", unknown.Name, "#C9");
+			Assert.AreEqual ("always", unknown.Value, "#C10");
 		}
 
 		[Test] // bug #485557
@@ -556,20 +554,26 @@ namespace MonoTests.System.Web {
 
 			KnownResponseHeader known;
 
-			Assert.AreEqual (3, f.KnownResponseHeaders.Count, "#B1");
-			known = (KnownResponseHeader) f.KnownResponseHeaders [0];
-			Assert.AreEqual (HttpWorkerRequest.HeaderTransferEncoding, known.Index, "#B2");
-			Assert.AreEqual ("chunked", known.Value, "#B3");
-			known = (KnownResponseHeader) f.KnownResponseHeaders [1];
+			Assert.AreEqual (2, f.KnownResponseHeaders.Count, "#B1");
+			// Assert.IsTrue (f != null, "f is null");
+			// Assert.IsTrue (f.KnownResponseHeaders != null, "f.KnownResponseHeaders is null");
+			// Assert.IsTrue (f.KnownResponseHeaders ["Transfer-Encoding"] != null, "No Transfer-Encoding");
+			
+			// known = (KnownResponseHeader) f.KnownResponseHeaders ["Transfer-Encoding"];
+			// Assert.AreEqual (HttpWorkerRequest.HeaderTransferEncoding, known.Index, "#B2");
+			// Assert.AreEqual ("chunked", known.Value, "#B3");
+			
+			known = (KnownResponseHeader) f.KnownResponseHeaders ["Cache-Control"];
 			Assert.AreEqual (HttpWorkerRequest.HeaderCacheControl, known.Index, "#B4");
 			Assert.AreEqual ("private", known.Value, "#B5");
-			known = (KnownResponseHeader) f.KnownResponseHeaders [2];
+			
+			known = (KnownResponseHeader) f.KnownResponseHeaders ["Content-Type"];
 			Assert.AreEqual (HttpWorkerRequest.HeaderContentType, known.Index, "#B6");
 			Assert.AreEqual ("text/html", known.Value, "#B7");
 
 #if NET_2_0
 			Assert.AreEqual (1, f.UnknownResponseHeaders.Count, "#C1");
-			UnknownResponseHeader unknown = (UnknownResponseHeader) f.UnknownResponseHeaders [0];
+			UnknownResponseHeader unknown = (UnknownResponseHeader) f.UnknownResponseHeaders ["X-AspNet-Version"];
 			Assert.AreEqual ("X-AspNet-Version", unknown.Name, "#C2");
 			Assert.AreEqual (Environment.Version.ToString (3), unknown.Value, "#C3");
 #else