Changed the GitCommandResult, the GitStreamResult, and the `GitFi…

…leResult` to write data directly in binary format. This prevents the transmission of the `charset=iso-8859-1` piece in the Content-type header, which was causing issues with JGit. This is more for #24.
otac0n · Sep 16, 2011 · f82a433 · f82a433
1 parent ea29e32
commit f82a433
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/WebGitNet/ActionResults/GitCommandResult.cs b/WebGitNet/ActionResults/GitCommandResult.cs
@@ -45,23 +45,23 @@ public override void ExecuteResult(ControllerContext context)
             var response = context.HttpContext.Response;
 
             var commandResult = GitUtilities.Execute(string.Format(this.commandFormat, this.service), this.workingDir);
+            var commandData = GitUtilities.DefaultEncoding.GetBytes(commandResult);
 
             response.StatusCode = 200;
             response.ContentType = "application/x-git-" + this.service + "-advertisement";
-            response.ContentEncoding = GitUtilities.DefaultEncoding;
-            response.Write(PacketFormat(string.Format("# service=git-{0}\n", this.service)));
-            response.Write(PacketFlush());
-            response.Write(commandResult);
+            response.BinaryWrite(PacketFormat(string.Format("# service=git-{0}\n", this.service)));
+            response.BinaryWrite(PacketFlush());
+            response.BinaryWrite(commandData);
         }
 
-        private static string PacketFormat(string packet)
+        private static byte[] PacketFormat(string packet)
         {
-            return (packet.Length + 4).ToString("X").ToLower().PadLeft(4, '0') + packet;
+            return GitUtilities.DefaultEncoding.GetBytes((packet.Length + 4).ToString("X").ToLower().PadLeft(4, '0') + packet);
         }
 
-        private static string PacketFlush()
+        private static byte[] PacketFlush()
         {
-            return "0000";
+            return new[] { (byte)'0', (byte)'0', (byte)'0', (byte)'0' };
         }
     }
 }
diff --git a/WebGitNet/ActionResults/GitFileResult.cs b/WebGitNet/ActionResults/GitFileResult.cs
@@ -31,7 +31,6 @@ public override void ExecuteResult(ControllerContext context)
 
             response.ContentType = this.contentType;
             response.AddHeader("Content-disposition", "attachment");
-            response.ContentEncoding = GitUtilities.DefaultEncoding;
             response.Buffer = false;
             response.BufferOutput = false;
 
@@ -41,7 +40,8 @@ public override void ExecuteResult(ControllerContext context)
                 int writeCount;
                 while ((writeCount = git.StandardOutput.ReadBlock(writeBuffer, 0, writeBuffer.Length)) > 0)
                 {
-                    response.Write(writeBuffer, 0, writeCount);
+                    var bytes = GitUtilities.DefaultEncoding.GetBytes(writeBuffer, 0, writeCount);
+                    response.BinaryWrite(bytes);
                 }
 
                 git.WaitForExit();

diff --git a/WebGitNet/ActionResults/GitStreamResult.cs b/WebGitNet/ActionResults/GitStreamResult.cs
@@ -49,7 +49,6 @@ public override void ExecuteResult(ControllerContext context)
             var request = context.HttpContext.Request;
 
             response.ContentType = "application/git-" + this.action + "-result";
-            response.ContentEncoding = GitUtilities.DefaultEncoding;
 
             using (var git = GitUtilities.Start(string.Format(this.commandFormat, this.action), this.repoPath, redirectInput: true))
             {
@@ -88,7 +87,8 @@ public override void ExecuteResult(ControllerContext context)
                 int writeCount;
                 while ((writeCount = git.StandardOutput.ReadBlock(writeBuffer, 0, writeBuffer.Length)) > 0)
                 {
-                    response.Write(writeBuffer, 0, writeCount);
+                    var bytes = GitUtilities.DefaultEncoding.GetBytes(writeBuffer, 0, writeCount);
+                    response.BinaryWrite(bytes);
                 }
 
                 readThread.Join();