2003-06-30 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* HttpRequest.cs: added REMOTE_PORT.
	* HttpValueCollection.cs: fixed bug #45490.

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

diff --git a/mcs/class/System.Web/System.Web/ChangeLog b/mcs/class/System.Web/System.Web/ChangeLog
index f17590f245340b98269b794280739aae5b14d202..cf0eb32736ad85ee136f01a3d344a509e854a932 100644 (file)
--- a/mcs/class/System.Web/System.Web/ChangeLog
+++ b/mcs/class/System.Web/System.Web/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-30  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * HttpRequest.cs: added REMOTE_PORT.
+       * HttpValueCollection.cs: fixed bug #45490.
+
 2003-05-13  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * HttpApplication.cs:

diff --git a/mcs/class/System.Web/System.Web/HttpRequest.cs b/mcs/class/System.Web/System.Web/HttpRequest.cs
index ed6fd51992bb94c14de649df327ed809d4fac985..56ea4ad9d4a28f5d946b7ab15f24addb7586743d 100644 (file)
--- a/mcs/class/System.Web/System.Web/HttpRequest.cs
+++ b/mcs/class/System.Web/System.Web/HttpRequest.cs
@@ -172,6 +172,7 @@ namespace System.Web {
                                _oServerVariables.Add("LOCAL_ADDR", _WorkerRequest.GetLocalAddress());\r
                                _oServerVariables.Add("REMOTE_ADDR", UserHostAddress);\r
                                _oServerVariables.Add("REMOTE_HOST", UserHostName);\r
+                               _oServerVariables.Add("REMOTE_PORT", _WorkerRequest.GetRemotePort ().ToString ());\r
                                _oServerVariables.Add("REQUEST_METHOD", HttpMethod);\r
                                _oServerVariables.Add("SERVER_NAME", _WorkerRequest.GetServerName());\r
                                _oServerVariables.Add("SERVER_PORT", _WorkerRequest.GetLocalPort().ToString());\r
@@ -647,7 +648,6 @@ namespace System.Web {
                        }\r
                }\r
 \r
-               [MonoTODO("Add cookie collection to our Params collection via merge")]\r
                public NameValueCollection Params {\r
                        get {\r
                                if (_oParams == null) {\r
@@ -656,8 +656,9 @@ namespace System.Web {
                                        _oParams.Merge(QueryString);\r
                                        _oParams.Merge(Form);\r
                                        _oParams.Merge(ServerVariables);\r
-                                       // TODO: Cookie\r
-\r
+                                       string [] cookies = Cookies.AllKeys;\r
+                                       foreach (string k in cookies)\r
+                                               _oParams.Add (k, Cookies [k].ToString ());\r
                                        _oParams.MakeReadOnly();\r
                                }\r
 \r

diff --git a/mcs/class/System.Web/System.Web/HttpValueCollection.cs b/mcs/class/System.Web/System.Web/HttpValueCollection.cs
index a120094cbeae9375721a8151bc022e481db4010b..60d4fd0f2c98bc76c1f1524f5f8ed7c51e42a3ab 100644 (file)
--- a/mcs/class/System.Web/System.Web/HttpValueCollection.cs
+++ b/mcs/class/System.Web/System.Web/HttpValueCollection.cs
@@ -92,6 +92,8 @@ namespace System.Web
                internal void FillFromQueryString (string sData, Encoding encoding)
                {
                        _bHeaders = false;
+                       if (sData == null || sData == "")
+                               return;
 
                        string k, v;
                        int eq;