2004-06-07 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* System.Web.dll.sources: removing ServerVariablesCollection. It does
	not compile.

	* System.Web/HttpRequest.cs: reverting patch from Alon Gazit. Uses the
	above file that doesn't compile.

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

diff --git a/mcs/class/System.Web/ChangeLog b/mcs/class/System.Web/ChangeLog
index 837e9ee22d011fd0024d3a90f9c218486ce6e590..502b723dfb3690443a71a4e097ea77be66de12df 100644 (file)
--- a/mcs/class/System.Web/ChangeLog
+++ b/mcs/class/System.Web/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-07  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * System.Web.dll.sources: removing ServerVariablesCollection. It does
+       not compile.
+
 2004-06-07  Alon Gazit <along@mainsoft.com>
 
        * System.Web.dll.sources: added ServerVariablesCollection.

diff --git a/mcs/class/System.Web/System.Web.dll.sources b/mcs/class/System.Web/System.Web.dll.sources
index 2fb52835ca07cebfc221a8a5da78722014939086..c15744d40a2d1220f854e474825e0ab1f606e5cd 100755 (executable)
--- a/mcs/class/System.Web/System.Web.dll.sources
+++ b/mcs/class/System.Web/System.Web.dll.sources
@@ -55,7 +55,6 @@ System.Web/ProcessShutdownReason.cs
 System.Web/ProcessStatus.cs
 System.Web/QueueManager.cs
 System.Web/StaticFileHandler.cs
-System.Web/ServerVariablesCollection.cs
 System.Web/TODOAttribute.cs
 System.Web/TimeoutManager.cs
 System.Web/TraceContext.cs

diff --git a/mcs/class/System.Web/System.Web/ChangeLog b/mcs/class/System.Web/System.Web/ChangeLog
index e93b6ef5c9a634330f88f651f20c65f852ac1f77..705b039ee767627b2b42b7c90eca02eb74de84de 100644 (file)
--- a/mcs/class/System.Web/System.Web/ChangeLog
+++ b/mcs/class/System.Web/System.Web/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-07  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * HttpRequest.cs: reverting patch from Alon Gazit. Uses the above file
+       that doesn't compile.
+
 2004-06-07  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * TraceData.cs: fixes nullref in an application that relies on

diff --git a/mcs/class/System.Web/System.Web/HttpRequest.cs b/mcs/class/System.Web/System.Web/HttpRequest.cs
index 142ca5749c1fd0b912f2d1f99824b8aeafc4db76..cbca55f94da6a87954a03aa98b81e31f8613c1da 100644 (file)
--- a/mcs/class/System.Web/System.Web/HttpRequest.cs
+++ b/mcs/class/System.Web/System.Web/HttpRequest.cs
@@ -147,8 +147,72 @@ namespace System.Web {
                                return;
                        }
 
-                       if (_oServerVariables == null){ \r
-                               _oServerVariables = new ServerVariablesCollection(this);            
+                       if (_oServerVariables == null) {
+                               string sTmp;
+
+                               _oServerVariables = new HttpValueCollection();
+                               
+                               _oServerVariables.Add("ALL_HTTP", GetAllHeaders(false));
+                               _oServerVariables.Add("ALL_RAW", GetAllHeaders(true));
+
+                               _oServerVariables.Add("APPL_MD_PATH", _WorkerRequest.GetServerVariable("APPL_MD_PATH"));
+                               _oServerVariables.Add("AUTH_PASSWORD", _WorkerRequest.GetServerVariable("AUTH_PASSWORD"));
+                               _oServerVariables.Add("CERT_COOKIE", _WorkerRequest.GetServerVariable("CERT_COOKIE"));
+                               _oServerVariables.Add("CERT_FLAGS", _WorkerRequest.GetServerVariable("CERT_FLAGS"));
+                               _oServerVariables.Add("CERT_ISSUER", _WorkerRequest.GetServerVariable("CERT_ISSUER"));
+                               _oServerVariables.Add("CERT_KEYSIZE", _WorkerRequest.GetServerVariable("CERT_KEYSIZE"));
+                               _oServerVariables.Add("CERT_SECRETKEYSIZE", _WorkerRequest.GetServerVariable("CERT_SECRETKEYSIZE"));
+                               _oServerVariables.Add("CERT_SERIALNUMBER", _WorkerRequest.GetServerVariable("CERT_SERIALNUMBER"));
+                               _oServerVariables.Add("CERT_SERVER_ISSUER", _WorkerRequest.GetServerVariable("CERT_SERVER_ISSUER"));
+                               _oServerVariables.Add("CERT_SERVER_SUBJECT", _WorkerRequest.GetServerVariable("CERT_SERVER_SUBJECT"));
+                               _oServerVariables.Add("CERT_SUBJECT", _WorkerRequest.GetServerVariable("CERT_SUBJECT"));
+
+                               _oServerVariables.Add("GATEWAY_INTERFACE", _WorkerRequest.GetServerVariable("GATEWAY_INTERFACE"));
+                               _oServerVariables.Add("HTTPS", _WorkerRequest.GetServerVariable("HTTPS"));
+                               _oServerVariables.Add("HTTPS_KEYSIZE", _WorkerRequest.GetServerVariable("HTTPS_KEYSIZE"));
+                               _oServerVariables.Add("HTTPS_SECRETKEYSIZE", _WorkerRequest.GetServerVariable("HTTPS_SECRETKEYSIZE"));
+
+                               _oServerVariables.Add("CONTENT_TYPE", ContentType);
+                               _oServerVariables.Add("HTTPS_SERVER_ISSUER", _WorkerRequest.GetServerVariable("HTTPS_SERVER_ISSUER"));
+                               _oServerVariables.Add("HTTPS_SERVER_SUBJECT", _WorkerRequest.GetServerVariable("HTTPS_SERVER_SUBJECT"));
+                               _oServerVariables.Add("INSTANCE_ID", _WorkerRequest.GetServerVariable("INSTANCE_ID"));
+                               _oServerVariables.Add("INSTANCE_META_PATH", _WorkerRequest.GetServerVariable("INSTANCE_META_PATH"));
+                               _oServerVariables.Add("LOCAL_ADDR", _WorkerRequest.GetLocalAddress());
+                               _oServerVariables.Add("REMOTE_ADDR", UserHostAddress);
+                               _oServerVariables.Add("REMOTE_HOST", UserHostName);
+                               _oServerVariables.Add("REMOTE_PORT", _WorkerRequest.GetRemotePort ().ToString ());
+                               _oServerVariables.Add("REQUEST_METHOD", HttpMethod);
+                               _oServerVariables.Add("SERVER_NAME", _WorkerRequest.GetServerName());
+                               _oServerVariables.Add("SERVER_PORT", _WorkerRequest.GetLocalPort().ToString());
+                               _oServerVariables.Add("SERVER_PROTOCOL", _WorkerRequest.GetHttpVersion());
+                               _oServerVariables.Add("SERVER_SOFTWARE", _WorkerRequest.GetServerVariable("SERVER_SOFTWARE"));
+
+                               if (_WorkerRequest.IsSecure()) {
+                                       _oServerVariables.Add("SERVER_PORT_SECURE", "1");
+                               } else {
+                                       _oServerVariables.Add("SERVER_PORT_SECURE", "0");
+                               }
+
+                               sTmp = _WorkerRequest.GetKnownRequestHeader(HttpWorkerRequest.HeaderContentLength);
+                               if (null != sTmp) {
+                                       _oServerVariables.Add("CONTENT_LENGTH", sTmp);
+                               }
+
+                               // TODO: Should be dynamic
+                               if (null != _oContext.User && _oContext.User.Identity.IsAuthenticated) {
+                                       _oServerVariables.Add("AUTH_TYPE", _oContext.User.Identity.AuthenticationType);
+                                       _oServerVariables.Add("AUTH_USER", _oContext.User.Identity.Name);
+                               } else {
+                                       _oServerVariables.Add("AUTH_TYPE", "");
+                                       _oServerVariables.Add("AUTH_USER", "");
+                               }
+
+                               _oServerVariables.Add("PATH_INFO", PathInfo);
+                               _oServerVariables.Add("PATH_TRANSLATED", PhysicalPath);
+                               _oServerVariables.Add("QUERY_STRING", QueryStringRaw);
+                               _oServerVariables.Add("SCRIPT_NAME", FilePath);
+                               // end dynamic
+            
                                _oServerVariables.MakeReadOnly();
                        }
                }