Author: wade
Date: 2007-08-27 14:41:58 -0400 (Mon, 27 Aug 2007)
New Revision: 84908
Modified:
tags/mono-1-2-5-p3/xsp/ChangeLog
tags/mono-1-2-5-p3/xsp/src/ModMonoWorkerRequest.cs
tags/mono-1-2-5-p3/xsp/src/Mono.WebServer/MonoWorkerRequest.cs
tags/mono-1-2-5-p3/xsp/src/Mono.WebServer/XSPApplicationHost.cs
Log:
Revert 83714, 84029, 84065 from the xsp 1.2.5 p3 tag,
so we have a record of what xsp was used for the p3 tag.
Modified: tags/mono-1-2-5-p3/xsp/ChangeLog
===================================================================
--- tags/mono-1-2-5-p3/xsp/ChangeLog 2007-08-27 18:37:48 UTC (rev 84907)
+++ tags/mono-1-2-5-p3/xsp/ChangeLog 2007-08-27 18:41:58 UTC (rev 84908)
@@ -1,22 +1,3 @@
-2007-08-14 Marek Habersack <[EMAIL PROTECTED]>
-
- * src/Mono.WebServer/XSPWorker.cs: do not rethrow an exception
- that might occur on write, write an error message to the console
- and close our end of the connection instead. Fixes bug #81699.
-
-2007-08-14 Marek Habersack <[EMAIL PROTECTED]>
-
- * src/ModMonoWorkerRequest.cs: ReadEntityBody makes sure the
- number of bytes to copy is > 0 and that the read buffer is not
- null.
-
-2007-08-08 Marek Habersack <[EMAIL PROTECTED]>
-
- * src/Mono.WebServer/MonoWorkerRequest.cs: don't use the
- SendResponseFromFile (IntPtr, long, long) overload from the
- SendResponseFromFile (string, long, long) one - prevents double
- close of the file handle.
-
2007-07-24 Wade Berrier <[EMAIL PROTECTED]>
* configure.in: version bump -> 1.2.5
Modified: tags/mono-1-2-5-p3/xsp/src/ModMonoWorkerRequest.cs
===================================================================
--- tags/mono-1-2-5-p3/xsp/src/ModMonoWorkerRequest.cs 2007-08-27 18:37:48 UTC
(rev 84907)
+++ tags/mono-1-2-5-p3/xsp/src/ModMonoWorkerRequest.cs 2007-08-27 18:41:58 UTC
(rev 84908)
@@ -551,8 +551,7 @@
byte [] readBuffer;
int nr = requestBroker.Read (requestId, size, out
readBuffer);
- if (nr > 0 && readBuffer != null)
- Buffer.BlockCopy (readBuffer, 0, buffer, 0, nr);
+ Buffer.BlockCopy (readBuffer, 0, buffer, 0, nr);
return nr;
}
Modified: tags/mono-1-2-5-p3/xsp/src/Mono.WebServer/MonoWorkerRequest.cs
===================================================================
--- tags/mono-1-2-5-p3/xsp/src/Mono.WebServer/MonoWorkerRequest.cs
2007-08-27 18:37:48 UTC (rev 84907)
+++ tags/mono-1-2-5-p3/xsp/src/Mono.WebServer/MonoWorkerRequest.cs
2007-08-27 18:41:58 UTC (rev 84908)
@@ -798,7 +798,7 @@
FileStream file = null;
try {
file = File.OpenRead (filename);
- SendFromStream (file, offset, length);
+ SendResponseFromFile (file.Handle, offset,
length);
} finally {
if (file != null)
file.Close ();
Modified: tags/mono-1-2-5-p3/xsp/src/Mono.WebServer/XSPApplicationHost.cs
===================================================================
--- tags/mono-1-2-5-p3/xsp/src/Mono.WebServer/XSPApplicationHost.cs
2007-08-27 18:37:48 UTC (rev 84907)
+++ tags/mono-1-2-5-p3/xsp/src/Mono.WebServer/XSPApplicationHost.cs
2007-08-27 18:41:58 UTC (rev 84908)
@@ -445,8 +445,8 @@
try {
stream.Write (buffer, position, size);
} catch (Exception) {
- Console.WriteLine ("Peer unexpectedly closed
the connection on write. Closing our end.\n{0}", ex);
Close ();
+ throw;
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
