sarsoo/Spotify.NET
1
0
Fork 0
mirror of https://github.com/Sarsoo/Spotify.NET.git synced 2024-10-17 07:23:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #91 from jholzer/master

Browse Source 
Fix in HttpProcessor
This commit is contained in:
Jonas Dellinger 2016-07-17 20:00:19 +02:00 committed by GitHub
commit 0ab2952e18
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
SpotifyAPI/Web/SimpleHttpServer.cs
View File

@ -15,11 +15,10 @@ using System.Web;
namespace SpotifyAPI.Web namespace SpotifyAPI.Web
{ {
public class HttpProcessor public class HttpProcessor : IDisposable
{ {
private const int MaxPostSize = 10 * 1024 * 1024; // 10MB private const int MaxPostSize = 10 * 1024 * 1024; // 10MB
private const int BufSize = 4096; private const int BufSize = 4096;
private readonly TcpClient _socket;
private readonly HttpServer _srv; private readonly HttpServer _srv;
private Stream _inputStream; private Stream _inputStream;
public Hashtable HttpHeaders = new Hashtable(); public Hashtable HttpHeaders = new Hashtable();
@ -27,17 +26,17 @@ namespace SpotifyAPI.Web
public string HttpProtocolVersionstring; public string HttpProtocolVersionstring;
public string HttpUrl; public string HttpUrl;
public StreamWriter OutputStream; public StreamWriter OutputStream;
private bool _isActive = true;
public HttpProcessor(TcpClient s, HttpServer srv) public HttpProcessor(HttpServer srv)
{ {
_socket = s;
_srv = srv; _srv = srv;
} }
private string StreamReadLine(Stream inputStream) private string StreamReadLine(Stream inputStream)
{ {
string data = ""; string data = "";
while (true) while (_isActive)
{ {
var nextChar = inputStream.ReadByte(); var nextChar = inputStream.ReadByte();
if (nextChar == '\n') if (nextChar == '\n')
@ -58,14 +57,16 @@ namespace SpotifyAPI.Web
return data; return data;
} }
public void Process() public void Process(object tcpClient)
{ {
TcpClient socket = tcpClient as TcpClient;
// we can't use a StreamReader for input, because it buffers up extra data on us inside it's // we can't use a StreamReader for input, because it buffers up extra data on us inside it's
// "processed" view of the world, and we want the data raw after the headers // "processed" view of the world, and we want the data raw after the headers
_inputStream = new BufferedStream(_socket.GetStream()); _inputStream = new BufferedStream(socket.GetStream());
// we probably shouldn't be using a streamwriter for all output from handlers either // we probably shouldn't be using a streamwriter for all output from handlers either
OutputStream = new StreamWriter(new BufferedStream(_socket.GetStream())); OutputStream = new StreamWriter(new BufferedStream(socket.GetStream()));
try try
{ {
ParseRequest(); ParseRequest();
@ -86,7 +87,7 @@ namespace SpotifyAPI.Web
OutputStream.Flush(); OutputStream.Flush();
_inputStream = null; _inputStream = null;
OutputStream = null; OutputStream = null;
_socket.Close(); socket.Close();
} }
public void ParseRequest() public void ParseRequest()
@ -184,6 +185,11 @@ namespace SpotifyAPI.Web
OutputStream.WriteLine("Connection: close"); OutputStream.WriteLine("Connection: close");
OutputStream.WriteLine(""); OutputStream.WriteLine("");
} }
public void Dispose()
{
_isActive = false;
}
} }
public abstract class HttpServer : IDisposable public abstract class HttpServer : IDisposable
@ -212,15 +218,18 @@ namespace SpotifyAPI.Web
{ {
_listener = new TcpListener(IPAddress.Any, Port); _listener = new TcpListener(IPAddress.Any, Port);
_listener.Start(); _listener.Start();
using (HttpProcessor processor = new HttpProcessor(this))
{
while (IsActive) while (IsActive)
{ {
TcpClient s = _listener.AcceptTcpClient(); TcpClient s = _listener.AcceptTcpClient();
HttpProcessor processor = new HttpProcessor(s, this);
Thread thread = new Thread(processor.Process); Thread thread = new Thread(processor.Process);
thread.Start(); thread.Start(s);
Thread.Sleep(1); Thread.Sleep(1);
} }
} }
}
catch (SocketException e) catch (SocketException e)
{ {
if (e.ErrorCode != 10004) //Ignore 10004, which is thrown when the thread gets terminated if (e.ErrorCode != 10004) //Ignore 10004, which is thrown when the thread gets terminated