- Tons of bug fixes

- New HeaderWriter class to move some code out of FosRequest
- Sanitized the Listener's loop quite a bit
- Changes to adapt to FastCgiNet

Fos.Tests/Browser/Browser.cs

@@ -19,7 +19,7 @@ class Browser
 		private Socket SocketToUse;
 
         protected FastCgiStream ResponseStream;
-        protected SocketRequest Request;
+        protected ApplicationSocketRequest Request;
         protected ushort RequestId
         {
             get
@@ -34,7 +34,7 @@ protected void SendBeginRequest(Socket sock)
             var beginRequestRecord = new BeginRequestRecord(requestId);
             beginRequestRecord.ApplicationMustCloseConnection = true;
             beginRequestRecord.Role = Role.Responder;
-            Request = new SocketRequest(sock, beginRequestRecord, true);
+            Request = new ApplicationSocketRequest(sock, beginRequestRecord);
             Request.Send(beginRequestRecord);
         }
 

Fos.Tests/Browser/BrowserResponse.cs

@@ -32,13 +32,13 @@ public BrowserResponse(Stream response)
 				while ((line = reader.ReadLine()) != string.Empty)
 				{
 					spaceIdx = line.IndexOf(' ');
+                    Console.WriteLine(line);
 					string headerName = line.Substring(0, spaceIdx - 1);
 					string headerValue = line.Substring(spaceIdx + 1);
-					Console.WriteLine("{0}: {1}", headerName, headerValue);
+					//Console.WriteLine("{0}: {1}", headerName, headerValue);
 					Headers.Add(headerName, headerValue);
 				}
 
-
     			Console.WriteLine ("4");
 
     			// TODO: Why do we need to do this? Something is very strange here!
@@ -54,10 +54,9 @@ public BrowserResponse(Stream response)
     					Console.Write ((char)buf[i]);
     				ResponseBody.Write(buf, 0, bytesRead);
     			}
-
-    			ResponseBody.Position = 0;
-    			response.Dispose();
             }
+
+            ResponseBody.Position = 0;
 		}
 
 		public void Dispose()

Fos.Tests/Fos.Tests.csproj

@@ -52,7 +52,8 @@
     <Compile Include="SocketTests.cs" />
     <Compile Include="Logger\OneRequestTestLogger.cs" />
     <Compile Include="ResponseAndRequestHeaders.cs" />
-    <Compile Include="StdoutStream.cs" />
+    <Compile Include="Streams\StdoutStream.cs" />
+    <Compile Include="Streams\HeaderWriter.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
@@ -72,5 +73,6 @@
     <Folder Include="Middleware\" />
     <Folder Include="Browser\" />
     <Folder Include="Logger\" />
+    <Folder Include="Streams\" />
   </ItemGroup>
 </Project>

Fos.Tests/Logger/AbruptConnectionClosing.cs

@@ -54,7 +54,7 @@ public void CloseConnectionAbruptlyAfterSendingBeginRequestRecord()
                     var beginReq = new BeginRequestRecord(1);
                     using (var req = new FosRequest(sock, logger))
                     {
-                        req.SetBeginRequest(beginReq);
+                        req.AddReceivedRecord(beginReq);
                         req.Send(beginReq);
                     }
                 }

Fos.Tests/Startup.cs

@@ -7,6 +7,15 @@ namespace Fos.Tests
 	[TestFixture]
 	public class Startup
 	{
+        [Test]
+        public void CloseAndFlush()
+        {
+            var memStream = new System.IO.MemoryStream();
+
+            memStream.Close();
+            memStream.Flush();
+        }
+
 		[Test]
 		public void StartAndDispose()
 		{

Fos.Tests/Streams/HeaderWriter.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Linq;
+using NUnit.Framework;
+using Fos;
+using Fos.Streams;
+using System.IO;
+
+namespace Fos.Tests
+{
+	[TestFixture]
+    public class HeaderWriterTests
+	{
+		[Test]
+		public void OnFirstWriteAndOnStreamFillEvents()
+		{
+            byte[] buf = new byte[1024];
+            using (var s = new MemoryStream(buf))
+            {
+                using (var writer = new HeaderWriter(s))
+                {
+                    writer.Write("Status", "200");
+                    writer.WriteLine();
+                }
+            }
+
+            int writtenLength = "Status: 200\r\n\r\n".Length;
+            var contents = System.Text.ASCIIEncoding.ASCII.GetString(buf, 0, writtenLength);
+            Assert.AreEqual("Status: 200\r\n\r\n", contents);
+		}
+	}
+}

Fos.Tests/StdoutStream.cs → Fos.Tests/Streams/StdoutStream.cs

@@ -2,7 +2,7 @@
 using System.Linq;
 using NUnit.Framework;
 using Fos;
-using Fos.Listener;
+using Fos.Streams;
 using System.IO;
 
 namespace Fos.Tests
@@ -26,9 +26,7 @@ public void OnFirstWriteAndOnStreamFillEvents()
                             numFirstWrites++; };
 
                         int numStreamFills = 0;
-                        Stream lastFilledStream = null;
-                        s.OnStreamFill += (filledStream) => {
-                            lastFilledStream = filledStream;
+                        s.OnStreamFill += () => {
                             numStreamFills++;
                         };
 
@@ -43,7 +41,6 @@ public void OnFirstWriteAndOnStreamFillEvents()
                         int numFilledStreams = 5;
                         int chunkSize = 65535 * numFilledStreams + 1;
                         byte[] hugeChunk = new byte[chunkSize];
-                        Assert.IsNull(lastFilledStream);
                         Assert.AreEqual(0, numStreamFills);
                         s.Write(hugeChunk, 0, chunkSize);
                         Assert.AreEqual(numFilledStreams, numStreamFills);

Fos/Fos.csproj

@@ -46,7 +46,6 @@
     <Compile Include="CustomPages\EmptyResponsePage.cs" />
     <Compile Include="CustomPages\ApplicationErrorPage.cs" />
     <Compile Include="CustomPages\ICustomPage.cs" />
-    <Compile Include="Listener\ByteReaderAndRequest.cs" />
     <Compile Include="Listener\SocketListener.cs" />
     <Compile Include="Listener\FosRequest.cs" />
     <Compile Include="Logging\IServerLogger.cs" />
@@ -60,7 +59,10 @@
     <Compile Include="Owin\FosAppBuilder.cs" />
     <Compile Include="Middleware\FosOwinRoot.cs" />
     <Compile Include="SocketHelper.cs" />
-    <Compile Include="Listener\FosStdoutStream.cs" />
+    <Compile Include="Streams\FosStdoutStream.cs" />
+    <Compile Include="Listener\RecordFactoryAndRequest.cs" />
+    <Compile Include="Streams\HeaderWriter.cs" />
+    <Compile Include="Streams\NonEndingStdoutSocketStream.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
@@ -69,6 +71,7 @@
     <Folder Include="Logging\" />
     <Folder Include="CustomPages\" />
     <Folder Include="Logging\StatsLogging\" />
+    <Folder Include="Streams\" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />

Fos/FosSelfHost.cs

@@ -126,7 +126,7 @@ private void OnReceiveStdin(FosRequest req, StdinRecord rec)
 				//TODO: The task may have failed or something else happened, verify
                 // Remember that connections closed by the other side abruptly have already
                 // been closed by the listener loop, so we shouldn't call Request.CloseSocket() here again
-				if (t.Result)
+				if (req.ApplicationMustCloseConnection)
                 {
                     req.Dispose();
                 }