2004-03-24 Gonzalo Paniagua Javier <gonzalo@ximian.com>

* HttpWebRequest.cs: added the exception status to the error message. * WebConnection.cs: add headers using SetInternal instead of Add to bypass header name validation. Fixes bug #55994. * WebHeaderCollection.cs: added SetInternal (string header). svn path=/trunk/mcs/; revision=24549
baulig · Mar 24, 2004 · b24f237 · b24f237
1 parent eeeca84
commit b24f237
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2 deletions.
diff --git a/mcs/class/System/System.Net/ChangeLog b/mcs/class/System/System.Net/ChangeLog
@@ -1,3 +1,10 @@
+2004-03-24  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* HttpWebRequest.cs: added the exception status to the error message.
+	* WebConnection.cs: add headers using SetInternal instead of Add to
+	bypass header name validation. Fixes bug #55994.
+	* WebHeaderCollection.cs: added SetInternal (string header).
+
 2004-03-04  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* WebConnection.cs:

diff --git a/mcs/class/System/System.Net/HttpWebRequest.cs b/mcs/class/System/System.Net/HttpWebRequest.cs
@@ -927,7 +927,7 @@ internal void SetResponseError (WebExceptionStatus status, Exception e)
 				r = asyncWrite;
 
 			if (r != null) {
-				WebException wexc = new WebException ("Error getting response stream", e, status, null); 
+				WebException wexc = new WebException ("Error getting response stream: " + status, e, status, null); 
 				r.SetCompleted (false, wexc);
 				r.DoCallback ();
 				asyncRead = null;

diff --git a/mcs/class/System/System.Net/WebConnection.cs b/mcs/class/System/System.Net/WebConnection.cs
@@ -351,7 +351,7 @@ int GetResponse (byte [] buffer, int max)
 						return -1;
 
 					foreach (string s in headers)
-						Data.Headers.Add (s);
+						Data.Headers.SetInternal (s);
 
 					if (Data.StatusCode == (int) HttpStatusCode.Continue) {
 						sPoint.SendContinue = true;

diff --git a/mcs/class/System/System.Net/WebHeaderCollection.cs b/mcs/class/System/System.Net/WebHeaderCollection.cs
@@ -225,6 +225,16 @@ public override string ToString ()
 
 		// Internal Methods
 
+		// With this we don't check for invalid characters in header. See bug #55994.
+		internal void SetInternal (string header)
+		{
+			int pos = header.IndexOf (':');
+			if (pos == -1)
+				throw new ArgumentException ("no colon found", "header");				
+
+			SetInternal (header.Substring (0, pos), header.Substring (pos + 1));
+		}
+
 		internal void SetInternal (string name, string value)
 		{
 			if (value == null)