Author: miguel
Date: 2007-03-30 14:28:33 -0500 (Fri, 30 Mar 2007)
New Revision: 75231
Modified:
trunk/xsp/ChangeLog
trunk/xsp/src/Mono.WebServer/BaseRequestBroker.cs
Log:
Revert patch 75192, we should find the real source of the problem
Modified: trunk/xsp/ChangeLog
===================================================================
--- trunk/xsp/ChangeLog 2007-03-30 19:24:42 UTC (rev 75230)
+++ trunk/xsp/ChangeLog 2007-03-30 19:28:33 UTC (rev 75231)
@@ -1,9 +1,5 @@
2007-03-30 Marek Habersack <[EMAIL PROTECTED]>
- * src/Mono.WebServer/BaseRequestBroker.cs: protect access to the
- buffer in Read at least a bit. It can still be released by some
- other thread after or during Read.
-
* src/Mono.WebServer/Tracing.cs: added a utility class to help in
tracing.
Modified: trunk/xsp/src/Mono.WebServer/BaseRequestBroker.cs
===================================================================
--- trunk/xsp/src/Mono.WebServer/BaseRequestBroker.cs 2007-03-30 19:24:42 UTC
(rev 75230)
+++ trunk/xsp/src/Mono.WebServer/BaseRequestBroker.cs 2007-03-30 19:28:33 UTC
(rev 75231)
@@ -35,8 +35,6 @@
{
public class BaseRequestBroker: MarshalByRefObject, IRequestBroker
{
- const int BufferAllocSize = 16384;
-
Hashtable requests = new Hashtable ();
Hashtable buffers = new Hashtable ();
@@ -45,8 +43,8 @@
{
if (stk.Count > 0)
return (byte []) stk.Pop ();
-
- return new byte [BufferAllocSize];;
+
+ return new byte [16384];
}
static void ReleaseBuffer (byte [] buffer)
@@ -57,7 +55,7 @@
public int RegisterRequest (Worker worker)
{
int result = worker.GetHashCode ();
- lock (requests) {
+ lock (requests) {
requests [result] = worker;
buffers [result] = Allocate16k ();
}
@@ -76,18 +74,18 @@
public int Read (int requestId, int size, out byte[] buffer)
{
- buffer = null;
- if (size != BufferAllocSize)
+ if (size == 16384) {
+ buffer = (byte []) buffers [requestId];
+ } else {
buffer = new byte[size];
+ }
Worker w;
lock (requests) {
- if (buffer == null)
- buffer = (byte []) buffers [requestId];
w = (Worker) requests [requestId];
}
int nread = 0;
- if (w != null && buffer != null)
+ if (w != null)
nread = w.Read (buffer, 0, size);
return nread;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches