From 1e14a1752ea4022055c38cbfd3a5cff563a13784 Mon Sep 17 00:00:00 2001 From: Marek Habersack Date: Tue, 13 Apr 2010 17:45:32 +0000 Subject: [PATCH] Backport of r155319 svn path=/branches/mono-2-6/xsp/; revision=155320 --- ChangeLog | 5 +++++ src/Mono.WebServer.Apache/ModMonoRequest.cs | 1 + 2 files changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index ce3f1e8..7cf66f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-04-13 Marek Habersack + + * ModMonoRequest.cs: SendResponseFromMemory must advance the + pointer when not on Linux. + 2010-03-31 Marek Habersack * man/xsp.1.in: updated documentation of the --nonstop diff --git a/src/Mono.WebServer.Apache/ModMonoRequest.cs b/src/Mono.WebServer.Apache/ModMonoRequest.cs index cd45eb4..8c05d50 100644 --- a/src/Mono.WebServer.Apache/ModMonoRequest.cs +++ b/src/Mono.WebServer.Apache/ModMonoRequest.cs @@ -322,6 +322,7 @@ namespace Mono.WebServer 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); } }