Author: kostat
Date: 2006-01-19 11:19:40 -0500 (Thu, 19 Jan 2006)
New Revision: 55790
Modified:
trunk/mcs/class/System.Web/System.Web.Hosting/ChangeLog
trunk/mcs/class/System.Web/System.Web.Hosting/ServletWorkerRequest.jvm.cs
trunk/mcs/class/System.Web/System.Web.J2EE/BaseHttpServlet.cs
trunk/mcs/class/System.Web/System.Web.J2EE/ChangeLog
Log:
refactoring
Modified: trunk/mcs/class/System.Web/System.Web.Hosting/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Hosting/ChangeLog 2006-01-19
16:11:55 UTC (rev 55789)
+++ trunk/mcs/class/System.Web/System.Web.Hosting/ChangeLog 2006-01-19
16:19:40 UTC (rev 55790)
@@ -1,3 +1,7 @@
+2006-01-19 Konstantin Triger <[EMAIL PROTECTED]>
+
+ * ServletWorkerRequest.jvm.cs: refactoring.
+
2005-11-28 Robert Jordan <[EMAIL PROTECTED]>
* SimpleWorkerRequest.cs: fixed MapPath () for the case
Modified:
trunk/mcs/class/System.Web/System.Web.Hosting/ServletWorkerRequest.jvm.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Hosting/ServletWorkerRequest.jvm.cs
2006-01-19 16:11:55 UTC (rev 55789)
+++ trunk/mcs/class/System.Web/System.Web.Hosting/ServletWorkerRequest.jvm.cs
2006-01-19 16:19:40 UTC (rev 55790)
@@ -33,299 +33,154 @@
using System.Web;
using javax.servlet;
using javax.servlet.http;
+using System.Collections.Specialized;
+using System.Globalization;
-namespace System.Web.Hosting
-{
+namespace System.Web.Hosting {
[MonoTODO("Implement security demands on the path usage functions (and
review)")]
[ComVisible (false)]
- internal class ServletWorkerRequest : HttpWorkerRequest
- {
- private string _Page;
- private string _Query;
- private string _PathInfo = String.Empty;
- private string _AppVirtualPath;
- private string _AppPhysicalPath;
- private string _AppInstallPath;
- private bool _HasInstallInfo;
-
- private static string SLASH = "/";
+ internal sealed class ServletWorkerRequest : HttpWorkerRequest {
+ readonly HttpServlet _HttpServlet;
+ readonly HttpServletRequest _HttpServletRequest;
+ readonly HttpServletResponse _HttpServletResponse;
- private ServletOutputStream _ServletOutputStream;
- private HttpServlet _HttpServlet;
- private HttpServletRequest _HttpServletRequest;
- private HttpServletResponse _HttpServletResponse;
+ static readonly StringDictionary _srvVarsToHeaderMap;
+
private string [][] unknownHeaders;
private HttpWorkerRequest.EndOfSendNotification
_endOfSendCallback;
private object _endOfSendArgs;
-
- private ServletWorkerRequest ()
- {
+ static ServletWorkerRequest() {
+ _srvVarsToHeaderMap = new StringDictionary();
+ _srvVarsToHeaderMap.Add("HTTP_ACCEPT", "Accept");
+ _srvVarsToHeaderMap.Add("HTTP_REFERER", "Referer");
+ _srvVarsToHeaderMap.Add("HTTP_ACCEPT_LANGUAGE",
"Accept-Language");
+ _srvVarsToHeaderMap.Add("HTTP_ACCEPT_ENCODING",
"Accept-Encoding");
+ _srvVarsToHeaderMap.Add("HTTP_CONNECTION",
"Connection");
+ _srvVarsToHeaderMap.Add("HTTP_HOST", "Host");
+ _srvVarsToHeaderMap.Add("HTTP_USER_AGENT",
"User-Agent");
+ _srvVarsToHeaderMap.Add("HTTP_SOAPACTION",
"SOAPAction");
}
- public ServletWorkerRequest (HttpServlet servlet,
HttpServletRequest req, HttpServletResponse resp, ServletOutputStream output)
- :this(String.Empty, String.Empty ,String.Empty,
String.Empty ,null)
- {
-#if DEBUG
- Console.WriteLine("Constructor 1 of
ServletWorkerRequest!! -->");
-#endif
+ public ServletWorkerRequest (HttpServlet servlet,
HttpServletRequest req, HttpServletResponse resp) {
_HttpServlet = servlet;
_HttpServletRequest = req;
_HttpServletResponse = resp;
- _ServletOutputStream = output;
-
- string contextPath = req.getContextPath();
- string requestURI = req.getRequestURI();
- if (requestURI.Equals(contextPath) ||
- ((requestURI.Length - contextPath.Length) == 1)
&& requestURI[requestURI.Length-1] == '/' && requestURI.StartsWith(contextPath))
- requestURI = contextPath + req.getServletPath();
-
- _Page = requestURI.Substring(contextPath.Length);
-
- if (_Page.StartsWith("/"))
- _Page = _Page.Substring(1);
-
- _Query = req.getQueryString();
- //_PathInfo = req.getPathInfo();
- _AppVirtualPath = req.getContextPath();
- _AppPhysicalPath =
J2EEUtils.GetApplicationRealPath(servlet.getServletConfig());
-#if DEBUG
- LogCurrentPageLocation();
-#endif
}
- public ServletWorkerRequest (string Page, string Query,
ServletOutputStream output)
- :this(Page, Query)
- {
-#if DEBUG
- Console.WriteLine("Constructor 2 of
ServletWorkerRequest!! -->");
-#endif
- //_Page = Page;
- ParsePathInfo ();
-
- //_Query = Query;
- AppDomain current = AppDomain.CurrentDomain;
- object o = current.GetData (".appPath");
- if (o == null)
- throw new HttpException ("Cannot get .appPath");
- _AppPhysicalPath =
(string)current.GetData(IAppDomainConfig.WEB_APP_DIR);
-
- o = current.GetData (".hostingVirtualPath");
- if (o == null)
- throw new HttpException ("Cannot get
.hostingVirtualPath");
- _AppVirtualPath = CheckAndAddVSlash (o.ToString ());
-
- o = current.GetData (".hostingInstallDir");
- if (o == null)
- throw new HttpException ("Cannot get
.hostingInstallDir");
- _AppInstallPath = o.ToString ();
- _ServletOutputStream = output;
-
- if (_AppPhysicalPath == null)
- throw new HttpException ("Invalid app domain");
-
- _HasInstallInfo = true;
-#if DEBUG
- LogCurrentPageLocation();
-#endif
- }
-
- public ServletWorkerRequest (string AppVirtualPath,
- string AppPhysicalPath,
- string Page,
- string Query,
- ServletOutputStream output) : this
(Page, Query)
- {
-#if DEBUG
- Console.WriteLine("Constructor 3 of
ServletWorkerRequest!! -->");
-#endif
- if (AppDomain.CurrentDomain.GetData (".appPath") ==
null)
- throw new HttpException ("Invalid app domain");
-
- //_Page = Page;
- ParsePathInfo ();
- //_Query = Query;
- _AppVirtualPath = AppVirtualPath;
- _AppPhysicalPath = CheckAndAddSlash (AppPhysicalPath);
- _ServletOutputStream = output;
- _HasInstallInfo = false;
-#if DEBUG
- LogCurrentPageLocation();
-#endif
- }
-
- public ServletWorkerRequest (string Page, string Query)
- {
- _Page = Page;
-
- _Query = Query;
- AppDomain current = AppDomain.CurrentDomain;
- object o = current.GetData (".appPath");
- if (o == null)
- throw new HttpException ("Cannot get .appPath");
- _AppPhysicalPath = o.ToString ();
-
- o = current.GetData (".hostingVirtualPath");
- if (o == null)
- throw new HttpException ("Cannot get
.hostingVirtualPath");
- _AppVirtualPath = o.ToString ();
-
- o = current.GetData (".hostingInstallDir");
- if (o == null)
- throw new HttpException ("Cannot get
.hostingInstallDir");
- _AppInstallPath = o.ToString ();
-
- if (_AppPhysicalPath == null)
- throw new HttpException ("Invalid app domain");
-
- _HasInstallInfo = true;
-
- ExtractPagePathInfo();
- }
-
- public ServletOutputStream ServletOutputStream
- {
- get
- {
- return _ServletOutputStream;
- }
- }
-
- public HttpServlet Servlet
- {
+ public HttpServlet Servlet {
get {
return _HttpServlet;
}
}
- public HttpServletRequest ServletRequest
- {
+ public HttpServletRequest ServletRequest {
get{
return _HttpServletRequest;
}
}
- public HttpServletResponse ServletResponse
- {
+ public HttpServletResponse ServletResponse {
get{
return _HttpServletResponse;
}
}
[MonoTODO("Implement security")]
- public override string MachineInstallDirectory
- {
+ public override string MachineInstallDirectory {
get {
- if (_HasInstallInfo)
- return _AppInstallPath;
-
return ICalls.GetMachineInstallDirectory ();
}
}
- public override string MachineConfigPath
- {
+ public override string MachineConfigPath {
get { return ICalls.GetMachineConfigPath (); }
}
- public override void EndOfRequest ()
- {
- _ServletOutputStream = null;
- _HttpServlet = null;
- _HttpServletRequest = null;
- _HttpServletResponse = null;
+ public override void EndOfRequest () {
if (_endOfSendCallback != null)
_endOfSendCallback(this, _endOfSendArgs);
}
- public override void FlushResponse (bool finalFlush)
- {
- _ServletOutputStream.flush();
+ public override void FlushResponse (bool finalFlush) {
+ ServletOutputStream servletOutputStream =
_HttpServletResponse.getOutputStream();
+ servletOutputStream.flush();
if (finalFlush)
- _ServletOutputStream.close();
+ servletOutputStream.close();
}
- public override string GetAppPath ()
- {
- return _AppVirtualPath;
+ public override string GetAppPath () {
+ return _HttpServletRequest.getContextPath();
}
- public override string GetAppPathTranslated ()
- {
- return _AppPhysicalPath;
+ public override string GetAppPathTranslated () {
+ return
J2EEUtils.GetApplicationRealPath(_HttpServlet.getServletConfig());;
}
- public override string GetFilePath ()
- {
- return CreatePath (false);
+ public override string GetFilePath () {
+ string uri = GetUriPath();
+ string pathInfo = GetPathInfo();
+ if (pathInfo != null && pathInfo.Length > 0)
+ uri = uri.Substring(0, uri.Length -
pathInfo.Length);
+
+ return uri;
}
- public override string GetFilePathTranslated ()
- {
- string page = _Page;
+ public override string GetFilePathTranslated () {
+ string page = GetFilePath ();
if (Path.DirectorySeparatorChar != '/')
- page = _Page.Replace ('/',
Path.DirectorySeparatorChar);
+ page = page.Replace ('/',
Path.DirectorySeparatorChar);
if (page [0] == Path.DirectorySeparatorChar)
page = page.Substring (1);
- return (Path.Combine (_AppPhysicalPath, page));
+ return Path.Combine (GetAppPathTranslated (), page);
}
- public override string GetHttpVerbName ()
- {
+ public override string GetHttpVerbName () {
return _HttpServletRequest.getMethod();
}
- public override string GetHttpVersion ()
- {
+ public override string GetHttpVersion () {
return _HttpServletRequest.getProtocol();
}
- public override string GetLocalAddress ()
- {
- return _HttpServletRequest.getServerName();
+ public override string GetLocalAddress () {
+ return _HttpServletRequest.getLocalAddr();
}
- public override int GetLocalPort ()
- {
- return _HttpServletRequest.getServerPort();
+ public override int GetLocalPort () {
+ return _HttpServletRequest.getLocalPort();
}
- public override string GetPathInfo ()
- {
- return (null != _PathInfo) ? _PathInfo : String.Empty;
+ public override string GetPathInfo () {
+ return _HttpServletRequest.getPathInfo();
}
- public override string GetQueryString ()
- {
- return _Query;
+ public override string GetQueryString () {
+ return _HttpServletRequest.getQueryString();
}
- public override string GetRawUrl ()
- {
- string path = CreatePath (true);
- if (null != _Query && _Query.Length > 0)
- return path + "?" + _Query;
-
- return path;
+ public override string GetRawUrl () {
+ return _HttpServletRequest.getRequestURL().ToString();
}
- public override string GetRemoteAddress()
- {
+ public override string GetRemoteAddress() {
return _HttpServletRequest.getRemoteAddr();
}
- public override int GetRemotePort()
- {
- try
- {
+ public override string GetRemoteName() {
+ return _HttpServletRequest.getRemoteHost();
+ }
+
+
+ public override int GetRemotePort() {
+ try {
return _HttpServletRequest.getRemotePort();
}
- catch(Exception e) //should catch also
java.lang.Throwable
- {
+ catch(Exception e) { //should catch also
java.lang.Throwable
//if servlet API is 2.3 and below - there is no
//method getRemotePort in ServletRequest
interface...
//should be described as limitation.
@@ -333,42 +188,66 @@
}
}
- public override string GetServerVariable(string name)
- {
- return String.Empty;
+ public override string GetServerVariable(string name) {
+ // FIXME: We need to make a proper mapping between the
standard server
+ // variables and java equivalent. probably we have to
have a configuration file
+ // which associates between the two. Pay a special
attention on GetUnknownRequestHeader/s
+ // while implementing. Ensure that system web "common"
code correctly calls each method.
+
+
+ string upperName = name.ToUpper();
+ string headerName = _srvVarsToHeaderMap[name];
+
+ if (headerName != null)
+ return _HttpServletRequest.getHeader(
headerName );
+
+ switch (name.ToUpper(CultureInfo.InvariantCulture)) {
+ case "AUTH_TYPE" : return
_HttpServletRequest.getAuthType();
+ case "CONTENT_LENGTH" : return
Convert.ToString(_HttpServletRequest.getContentLength());
+ case "CONTENT_TYPE" : return
_HttpServletRequest.getContentType();
+ case "QUERY_STRING" : return
_HttpServletRequest.getQueryString();
+ case "REMOTE_ADDR" : return
_HttpServletRequest.getRemoteAddr();
+ case "REMOTE_HOST" : return
_HttpServletRequest.getRemoteHost();
+ case "REMOTE_USER" : return
_HttpServletRequest.getRemoteUser();
+ case "REQUEST_METHOD" : return
_HttpServletRequest.getMethod();
+ case "REQUEST_URI" : return
_HttpServletRequest.getRequestURI();
+ case "SCRIPT_NAME" : return GetFilePath ();
+ case "SERVER_NAME" : return
_HttpServletRequest.getServerName();
+ case "SERVER_PORT" : return
Convert.ToString(_HttpServletRequest.getServerPort());
+ case "SERVER_PROTOCOL" : return
_HttpServletRequest.getProtocol();
+ case "SERVER_SOFTWARE" : return
Servlet.getServletContext().getServerInfo();
+ case "PATH_INFO" : return
_HttpServletRequest.getPathInfo();
+ default : return _HttpServletRequest.getHeader(
name );
+ }
}
- public override string GetUriPath()
- {
- return CreatePath (true);
+ public override string GetUriPath() {
+ return _HttpServletRequest.getRequestURI();
}
- public override IntPtr GetUserToken()
- {
+ public override IntPtr GetUserToken() {
return IntPtr.Zero;
}
- public override string MapPath (string path)
- {
- if (path.StartsWith(_AppVirtualPath))
- {
- path = path.Remove(0,_AppVirtualPath.Length);
+ public override string MapPath (string path) {
+ string appVirtualPath = GetAppPath();
+ if (path.StartsWith(appVirtualPath)) {
+ path = path.Remove(0,appVirtualPath.Length);
if (path.StartsWith("/"))
path = path.Remove(0,1);
}
//string realPath =
Servlet.getServletContext().getRealPath(path);
-// if (Path.IsPathRooted(path))
-// return path;
-// if
(!path.StartsWith(IAppDomainConfig.WAR_ROOT_SYMBOL)&&
-// !path.StartsWith("/") &&
!path.StartsWith("\\")&& !Path.IsPathRooted(path))
-// return IAppDomainConfig.WAR_ROOT_SYMBOL + "/" +
path;
-// else if
(!path.StartsWith(IAppDomainConfig.WAR_ROOT_SYMBOL)&& !Path.IsPathRooted(path))
-// return IAppDomainConfig.WAR_ROOT_SYMBOL + path;
-// else
-// return path;
+ // if (Path.IsPathRooted(path))
+ // return path;
+ // if
(!path.StartsWith(IAppDomainConfig.WAR_ROOT_SYMBOL)&&
+ // !path.StartsWith("/")
&& !path.StartsWith("\\")&& !Path.IsPathRooted(path))
+ // return
IAppDomainConfig.WAR_ROOT_SYMBOL + "/" + path;
+ // else if
(!path.StartsWith(IAppDomainConfig.WAR_ROOT_SYMBOL)&& !Path.IsPathRooted(path))
+ // return
IAppDomainConfig.WAR_ROOT_SYMBOL + path;
+ // else
+ // return path;
- if (path.StartsWith(IAppDomainConfig.WAR_ROOT_SYMBOL))
- {
+ if (path.StartsWith(IAppDomainConfig.WAR_ROOT_SYMBOL)) {
return path;
}
@@ -382,12 +261,11 @@
return retVal;
}
- public override void SendResponseFromFile (IntPtr handle, long
offset, long length)
- {
+ public override void SendResponseFromFile (IntPtr handle, long
offset, long length) {
+ throw new NotSupportedException();
}
- public override void SendResponseFromFile (string filename,
long offset, long length)
- {
+ public override void SendResponseFromFile (string filename,
long offset, long length) {
using (FileStream fs = File.OpenRead (filename)) {
byte [] buffer = new byte [4 * 1024];
@@ -403,152 +281,44 @@
}
}
- public override void SendResponseFromMemory (byte [] data, int
length)
- {
+ public override void SendResponseFromMemory (byte [] data, int
length) {
sbyte [] sdata =
vmw.common.TypeUtils.ToSByteArray(data);
- _ServletOutputStream.write(sdata, 0 , length);
+ _HttpServletResponse.getOutputStream().write(sdata, 0 ,
length);
}
- public override void SendStatus(int statusCode, string
statusDescription)
- {
- _HttpServletResponse.setStatus(statusCode,
statusDescription);
+ public override void SendStatus(int statusCode, string
statusDescription) {
+ // setStatus(int, string) is deprecated
+ _HttpServletResponse.setStatus(statusCode/*,
statusDescription*/);
}
- public override void SendUnknownResponseHeader(string name,
string value)
- {
- _HttpServletResponse.addHeader(name, value);
- }
-
- public override bool HeadersSent ()
- {
- return false;
- }
-
- public override void SendCalculatedContentLength (int
contentLength)
- {
- //FIXME: Should we ignore this for apache2?
- SendUnknownResponseHeader ("Content-Length",
contentLength.ToString ());
- }
-
- public override void SendKnownResponseHeader (int index, string
value)
- {
+ public override void SendUnknownResponseHeader(string name,
string value) {
if (HeadersSent ())
return;
- string headerName =
HttpWorkerRequest.GetKnownResponseHeaderName (index);
- SendUnknownResponseHeader (headerName, value);
+ _HttpServletResponse.addHeader(name, value);
}
-
- // Create's a path string
- private string CheckAndAddSlash(string sPath)
- {
- if (null == sPath)
- return null;
- if (String.Empty == sPath)
- return SLASH;
-
- if (!sPath.EndsWith ("" + Path.DirectorySeparatorChar))
- return sPath + Path.DirectorySeparatorChar;
-
- return sPath;
+ public override bool HeadersSent () {
+ return _HttpServletResponse.isCommitted();
}
- // Creates a path string
- private string CheckAndAddVSlash(string sPath)
- {
- if (null == sPath)
- return null;
-
- if (!sPath.EndsWith ("/"))
- return sPath + "/";
-
- return sPath;
+ public override void SendCalculatedContentLength (int
contentLength) {
+ _HttpServletResponse.setContentLength(contentLength);
}
- // Create's a path string
- private string CreatePath (bool bIncludePathInfo)
- {
- string sPath = Path.Combine (_AppVirtualPath, _Page);
-
- if (bIncludePathInfo && null != _PathInfo)
- {
- sPath += _PathInfo;
- }
-
- return sPath;
+ public override void SendKnownResponseHeader (int index, string
value) {
+ SendUnknownResponseHeader (GetKnownResponseHeaderName
(index), value);
}
- // "The extra path information, as given by the client. In
- // other words, scripts can be accessed by their virtual
- // pathname, followed by extra information at the end of this
- // path. The extra information is sent as PATH_INFO."
- private void ExtractPagePathInfo ()
- {
- if (_Page == null || _Page == String.Empty)
- return;
-
- string FullPath = GetFilePathTranslated ();
- int PathInfoLength = 0;
- string LastFile = String.Empty;
-
- while (PathInfoLength < _Page.Length) {
- if (LastFile.Length > 0) {
- // increase it by the length of the
file plus
- // a "/"
- //
- PathInfoLength += LastFile.Length + 1;
- }
-
- if (File.Exists (FullPath) == true)
- break;
-
- if (Directory.Exists (FullPath) == true) {
- PathInfoLength -= (LastFile.Length + 1);
- break;
- }
-
- LastFile = Path.GetFileName (FullPath);
- FullPath = Path.GetDirectoryName (FullPath);
- }
-
- if (PathInfoLength <= 0 || PathInfoLength >
_Page.Length)
- return;
-
- _PathInfo = _Page.Substring (_Page.Length -
PathInfoLength);
- _Page = _Page.Substring (0, _Page.Length -
PathInfoLength);
+ public override string GetKnownRequestHeader (int index) {
+ return
GetUnknownRequestHeader(GetKnownRequestHeaderName (index));
}
-
- // Parses out the string after / known as the "path info"
- private void ParsePathInfo ()
- {
- int iPos = _Page.LastIndexOf("/");
- if (iPos >= 0) {
- _PathInfo = _Page.Substring (iPos);
- _Page = _Page.Substring (0, iPos);
- }
- }
- public override string GetKnownRequestHeader (int index)
- {
- if (_HttpServletRequest == null)
- return null;
-
- string headerName =
HttpWorkerRequest.GetKnownRequestHeaderName (index);
-
- return _HttpServletRequest.getHeader(headerName);
- }
-
- public override string GetUnknownRequestHeader (string name)
- {
- if (_HttpServletRequest == null)
- return null;
-
+ public override string GetUnknownRequestHeader (string name) {
return _HttpServletRequest.getHeader(name);
}
- public override string [][] GetUnknownRequestHeaders ()
- {
+ public override string [][] GetUnknownRequestHeaders () {
if (unknownHeaders == null) {
ArrayList pairs = new ArrayList ();
for (java.util.Enumeration he =
_HttpServletRequest.getHeaderNames(); he.hasMoreElements() ;) {
@@ -570,32 +340,30 @@
return unknownHeaders;
}
- public override int ReadEntityBody (byte [] buffer, int size)
- {
+ public override int ReadEntityBody (byte [] buffer, int size) {
if (buffer == null || size == 0)
return 0;
- sbyte [] sbuffer = new sbyte [size];
- int r =
_HttpServletRequest.getInputStream().read(sbuffer, 0, size);
- for (int i=0; i < r; i++) buffer[i] = (byte)
sbuffer[i];
+ sbyte [] sbuffer =
vmw.common.TypeUtils.ToSByteArray(buffer);
+ int r =
_HttpServletRequest.getInputStream().read(sbuffer, 0, size);
return (r==-1)?0:r;
}
- public override void
SetEndOfSendNotification(System.Web.HttpWorkerRequest.EndOfSendNotification
callback, object extraData)
- {
+ public override void
SetEndOfSendNotification(System.Web.HttpWorkerRequest.EndOfSendNotification
callback, object extraData) {
_endOfSendCallback = callback;
_endOfSendArgs = extraData;
}
-
- // Prints some stats about the current _Page.
- private void LogCurrentPageLocation()
- {
-#if DEBUG
- Console.WriteLine(" relpath=" + _AppVirtualPath);
- Console.WriteLine(" physical path=" + _AppPhysicalPath);
- Console.WriteLine(" page=" + _Page);
-#endif
+
+ public override string GetProtocol() {
+ return _HttpServletRequest.getScheme();
}
-
+
+ public override string GetServerName() {
+ return _HttpServletRequest.getServerName();
+ }
+
+ public override bool IsSecure() {
+ return _HttpServletRequest.isSecure();
+ }
}
}
Modified: trunk/mcs/class/System.Web/System.Web.J2EE/BaseHttpServlet.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.J2EE/BaseHttpServlet.cs
2006-01-19 16:11:55 UTC (rev 55789)
+++ trunk/mcs/class/System.Web/System.Web.J2EE/BaseHttpServlet.cs
2006-01-19 16:19:40 UTC (rev 55790)
@@ -96,7 +96,7 @@
// PageMapper.LoadFileList();
resp.setContentType("text/html");
- HttpWorkerRequest gwr = new
ServletWorkerRequest(this, req, resp, resp.getOutputStream());
+ HttpWorkerRequest gwr = new
ServletWorkerRequest(this, req, resp);
HttpRuntime.ProcessRequest(gwr);
}
finally
Modified: trunk/mcs/class/System.Web/System.Web.J2EE/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.J2EE/ChangeLog 2006-01-19
16:11:55 UTC (rev 55789)
+++ trunk/mcs/class/System.Web/System.Web.J2EE/ChangeLog 2006-01-19
16:19:40 UTC (rev 55790)
@@ -1,3 +1,7 @@
+2006-01-19 Konstantin Triger <[EMAIL PROTECTED]>
+
+ * BaseHttpServlet.cs: call correct ServletWorkerRequest ctor
+
2006-01-09 Konstantin Triger <[EMAIL PROTECTED]>
* BaseHttpServlet.cs: merging main/32, main/33
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches