Permalink
Browse files

Backport of r155319

svn path=/branches/mono-2-6/xsp/; revision=155320
  • Loading branch information...
1 parent b86e6be commit 1e14a1752ea4022055c38cbfd3a5cff563a13784 @grendello grendello committed Apr 13, 2010
Showing with 6 additions and 0 deletions.
  1. +5 −0 ChangeLog
  2. +1 −0 src/Mono.WebServer.Apache/ModMonoRequest.cs
View
@@ -1,3 +1,8 @@
+2010-04-13 Marek Habersack <mhabersack@novell.com>
+
+ * ModMonoRequest.cs: SendResponseFromMemory must advance the
+ pointer when not on Linux.
+
2010-03-31 Marek Habersack <mhabersack@novell.com>
* man/xsp.1.in: updated documentation of the --nonstop
@@ -322,6 +322,7 @@ public void SendResponseFromMemory (IntPtr ptr, int length)
byte [] buf = writer_ms.GetBuffer ();
Marshal.Copy (ptr, buf, 0, size);
length -= size;
+ unsafe { ptr = (IntPtr)((byte*)ptr.ToPointer () + size); }
client.Send (buf, size, SocketFlags.None);
}
}

0 comments on commit 1e14a17

Please sign in to comment.