Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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.

svn path=/tags/mono-1-2-5-p3/xsp/; revision=84908
  • Loading branch information...
commit 95e23e62abb3be297c606a9d13e834504328d01c 1 parent 0f6cdef
Wade Berrier authored
19 ChangeLog
View
@@ -1,22 +1,3 @@
-2007-08-14 Marek Habersack <mhabersack@novell.com>
-
- * 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 <mhabersack@novell.com>
-
- * 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 <mhabersack@novell.com>
-
- * 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 <wberrier@novell.com>
* configure.in: version bump -> 1.2.5
3  src/ModMonoWorkerRequest.cs
View
@@ -551,8 +551,7 @@ public override int ReadEntityBody (byte [] buffer, int size)
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;
}
2  src/Mono.WebServer/MonoWorkerRequest.cs
View
@@ -798,7 +798,7 @@ public override void SendResponseFromFile (string filename, long offset, long le
FileStream file = null;
try {
file = File.OpenRead (filename);
- SendFromStream (file, offset, length);
+ SendResponseFromFile (file.Handle, offset, length);
} finally {
if (file != null)
file.Close ();
2  src/Mono.WebServer/XSPApplicationHost.cs
View
@@ -445,8 +445,8 @@ public override void Write (byte[] buffer, int position, int size)
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;
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.