Author: gonzalo
Date: 2005-04-19 18:50:06 -0400 (Tue, 19 Apr 2005)
New Revision: 43302

Modified:
   trunk/mcs/class/System.Web/System.Web/ChangeLog
   trunk/mcs/class/System.Web/System.Web/HttpRequest.cs
Log:
2005-04-19 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>

        * HttpRequest.cs: GetAllHeaders was returning the value twice instead
        of 'name: value'. When HTTP_ is requested on the output, don't include
        unknown headers.



Modified: trunk/mcs/class/System.Web/System.Web/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web/ChangeLog     2005-04-19 22:40:44 UTC 
(rev 43301)
+++ trunk/mcs/class/System.Web/System.Web/ChangeLog     2005-04-19 22:50:06 UTC 
(rev 43302)
@@ -1,3 +1,9 @@
+2005-04-19 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
+
+       * HttpRequest.cs: GetAllHeaders was returning the value twice instead
+       of 'name: value'. When HTTP_ is requested on the output, don't include
+       unknown headers.
+
 2005-03-23 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
 
        * HttpCookieCollection.cs: when adding more than one cookie with the

Modified: trunk/mcs/class/System.Web/System.Web/HttpRequest.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web/HttpRequest.cs        2005-04-19 
22:40:44 UTC (rev 43301)
+++ trunk/mcs/class/System.Web/System.Web/HttpRequest.cs        2005-04-19 
22:50:06 UTC (rev 43302)
@@ -125,7 +125,7 @@
                        return "HTTP_" + header.ToUpper().Replace("-", "_");
                }
 
-               internal string GetAllHeaders(bool Raw) {
+               internal string GetAllHeaders(bool raw) {
                        StringBuilder oData;
 
                        if (null == _WorkerRequest) {
@@ -139,12 +139,17 @@
                        int iCount = 0;
 
                        // Add all know headers
-                       for (; iCount != 40; iCount++) {
+                       for (; iCount != 
HttpWorkerRequest.RequestHeaderMaximum; iCount++) {
                                sHeaderValue = 
_WorkerRequest.GetKnownRequestHeader(iCount);
                                if (null != sHeaderValue && sHeaderValue.Length 
> 0) {
-                                       sHeaderName = 
_WorkerRequest.GetKnownRequestHeader(iCount);
+                                       sHeaderName = 
HttpWorkerRequest.GetKnownRequestHeaderName(iCount);
                                        if (null != sHeaderName && 
sHeaderName.Length > 0) {
-                                               oData.Append(sHeaderName);
+                                               if (raw) {
+                                                       
oData.Append(sHeaderName);
+                                               } else {
+                                                       oData.Append ("HTTP_");
+                                                       oData.Append 
(sHeaderName.ToUpper ().Replace ('-', '_'));
+                                               }
                                                oData.Append(": ");
                                                oData.Append(sHeaderValue);
                                                oData.Append("\r\n");
@@ -152,6 +157,9 @@
                                }
                        }
 
+                       if (!raw)
+                               return oData.ToString ();
+
                        // Get all other headers
                        string [][] arrUnknownHeaders = 
_WorkerRequest.GetUnknownRequestHeaders();
                        if (null != arrUnknownHeaders) {

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to