[Modify] Replace it

websocket-sharp/Net/ResponseStream.cs

@@ -166,20 +166,33 @@ namespace WebSocketSharp.Net
 
     private bool flushHeaders (bool closing)
     {
-      using (var buff = new MemoryStream ()) {
+      if (!_response.SendChunked) {
-        var headers = _response.WriteHeadersTo (buff);
+        if (_response.ContentLength64 != _body.Length)
-        var start = buff.Position;
+          return false;
+      }
+
+      var statusLine = _response.StatusLine;
+      var headers = _response.FullHeaders;
+
+      var buff = new MemoryStream ();
+      var enc = Encoding.UTF8;
+
+      using (var writer = new StreamWriter (buff, enc, 256)) {
+        writer.Write (statusLine);
+        writer.Write (headers.ToStringMultiValue (true));
+        writer.Flush ();
+
+        var start = enc.GetPreamble ().Length;
         var len = buff.Length - start;
+
         if (len > 32768)
           return false;
 
-        if (!_response.SendChunked && _response.ContentLength64 != _body.Length)
+        _write (buff.GetBuffer (), start, (int) len);
-          return false;
+      }
 
-        _write (buff.GetBuffer (), (int) start, (int) len);
       _response.CloseConnection = headers["Connection"] == "close";
       _response.HeadersSent = true;
-      }
 
       return true;
     }