Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Client- and serverside bug fixes #94

Open
wants to merge 39 commits into
base: master
Choose a base branch
from
Open

Client- and serverside bug fixes #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
a2a746a
added .user into ignore list
segor Oct 9, 2013
62dbb1d
fixed context early disposal in WebSocketClient
segor Oct 9, 2013
32129e2
Merge pull request #1 from segor/master
steforster Jan 18, 2014
312ca9c
fixed WebSocketClient.Disconnect().
steforster Jan 18, 2014
159027c
Socket disconnect event is sent to user code on client side.
steforster Jan 18, 2014
e42f44f
Made compileable under Monodevelop 2.8.6.3
steforster Jan 18, 2014
cc754ae
Fixed opcode for close frame in WebSocketClient
steforster Jan 19, 2014
ce7a5f2
Added Handler.FastDirectSendingMode.
steforster Jan 22, 2014
556dbc0
Skip pending send operations when disconnecting a client.
steforster Jan 22, 2014
630d3f2
Added static methods to shutdown Alchemy threads.
steforster Jan 25, 2014
0277df5
Fixed client disconnect sequence.
steforster Jan 25, 2014
fe46e41
Added CancellationSource to context;
steforster Jan 26, 2014
2adde2d
Corrected CR/LF.
steforster Jan 26, 2014
0b183fe
WebSocketClient: prevented null exception on disconnect.
steforster Feb 1, 2014
40dda63
Fixed threading issues when receiving many messages in client. And wh…
steforster Feb 4, 2014
e3a6c38
Fixed integration tests ClientServerSubProtocol.
steforster Feb 9, 2014
b2a603c
Support successive messages in the same receive buffer (server and cl…
steforster Feb 9, 2014
7a47745
Support breakpoints when starting unit tests from visual studio.
steforster Feb 15, 2014
4c40159
Fixed close message from server to client.
steforster Feb 16, 2014
10e759e
Improved TCPServer: Use asynchronous BeginAcceptTcpClient instead of …
steforster Feb 16, 2014
bbc3ef7
Changed serverside StartReceive(). Made it really asynchronous.
steforster Feb 16, 2014
8b87ee2
Reduced accessibility and made it more CLS compliant.
steforster Nov 11, 2014
775dd73
Define EOL for Visual Studio in .gitattributes
steforster Nov 11, 2014
9f197bc
Consequences of setting crlf in .gitattributes
steforster Nov 11, 2014
ccf2403
Monodevelop line ending = native
steforster Nov 12, 2014
73e9b53
Some more file changes because of crlf.
steforster Nov 12, 2014
cfbd0f8
Handle too long messages when header is received: Disconnect.
steforster Nov 16, 2014
f2fe7cf
Made it CLS compliant. Cleaned up Context.Disconnect and Close.
steforster Nov 22, 2014
6d66601
Prevent double OnDisconnected calls.
steforster Nov 22, 2014
48e7478
Tested DataFrame stream reading.
steforster Nov 23, 2014
8de02d9
Increased default buffersize to 1500 bytes and framesize to 1 MB.
steforster Nov 23, 2014
ca4c13b
FrameBuffer supports writing as stream.
steforster Nov 23, 2014
259f3a6
Added UserContext.Disconnect(): Let the server disconnect a client.
steforster Dec 29, 2014
3df4866
Removed dependency to System.Web.dll since it is not available in Xam…
steforster Dec 30, 2014
fbadb0a
Protect from NullReferenceException during shutdown or unexpected mes…
steforster Dec 31, 2014
7acee38
Upgraded solution to Visual Studio 2015
steforster May 14, 2016
4818854
Typo
steforster Jun 26, 2016
a07c58d
Update WebSocketClient.cs
shinigami-de Dec 6, 2016
4a2a0a4
Merge pull request #2 from shinigami-de/patch-1
steforster Dec 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
*.cs text eol=crlf diff=csharp
*.md text eol=crlf
*.csproj text eol=crlf merge=union
*.sln text eol=crlf merge=union
22 changes: 12 additions & 10 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
*.userprefs
*~
*ReSharper*
bin/*
obj/*
test/Unit/Alchemy/bin
test/Unit/Alchemy/obj
src/Alchemy/obj
src/Alchemy/bin
[Bb]in/
[Oo]bj/
test-results/
doxygen
_site
test/Integration/Alchemy/bin
test/Integration/Alchemy/obj
*.suo
*.suo
*.user
*.userprefs
*.pidb
*.bak
*.VisualState.xml
TestResult.xml
*.sln.ide/*
101 changes: 64 additions & 37 deletions Alchemy.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Alchemy", "src\Alchemy\Alchemy.csproj", "{45486CDE-86A3-4769-952F-E0821BF79493}"
EndProject
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.23107.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{32470B4C-0665-44B9-9A55-AF9C671FDAA5}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8C9C334C-588E-41A1-85FC-9DC035821D27}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Integration", "Integration", "{24B00C6C-88BE-4F83-B2E1-8CC8F145BFB9}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Alchemy", "Alchemy", "{D629207E-B540-40F6-B2B4-5BCDD033EAD6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AlchemyIntegrationTest", "test\Integration\Alchemy\AlchemyIntegrationTest.csproj", "{D7B6AB15-5986-4FDC-ADA8-9EF14DF8F26D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Unit", "Unit", "{A8BCA98B-12E7-4E13-99FE-09DDCA10BB26}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Alchemy", "Alchemy", "{DEF8E4AE-D1A2-4C33-A4EC-A51BDF6BD09F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Alchemy", "test\Unit\Alchemy\Alchemy.csproj", "{D62E2F92-A930-44D9-90FB-864CAF837BAE}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AlchemyUnitTest", "test\Unit\Alchemy\AlchemyUnitTest.csproj", "{D62E2F92-A930-44D9-90FB-864CAF837BAE}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Alchemy", "Alchemy", "{D629207E-B540-40F6-B2B4-5BCDD033EAD6}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8C9C334C-588E-41A1-85FC-9DC035821D27}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Alchemy", "test\Integration\Alchemy\Alchemy.csproj", "{D7B6AB15-5986-4FDC-ADA8-9EF14DF8F26D}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Alchemy", "src\Alchemy\Alchemy.csproj", "{45486CDE-86A3-4769-952F-E0821BF79493}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -31,30 +33,6 @@ Global
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{45486CDE-86A3-4769-952F-E0821BF79493}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{45486CDE-86A3-4769-952F-E0821BF79493}.Debug|Any CPU.Build.0 = Debug|Any CPU
{45486CDE-86A3-4769-952F-E0821BF79493}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{45486CDE-86A3-4769-952F-E0821BF79493}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{45486CDE-86A3-4769-952F-E0821BF79493}.Debug|x64.ActiveCfg = Debug|Any CPU
{45486CDE-86A3-4769-952F-E0821BF79493}.Debug|x86.ActiveCfg = Debug|Any CPU
{45486CDE-86A3-4769-952F-E0821BF79493}.Release|Any CPU.ActiveCfg = Release|Any CPU
{45486CDE-86A3-4769-952F-E0821BF79493}.Release|Any CPU.Build.0 = Release|Any CPU
{45486CDE-86A3-4769-952F-E0821BF79493}.Release|Mixed Platforms.ActiveCfg = Release|x64
{45486CDE-86A3-4769-952F-E0821BF79493}.Release|Mixed Platforms.Build.0 = Release|x64
{45486CDE-86A3-4769-952F-E0821BF79493}.Release|x64.ActiveCfg = Release|Any CPU
{45486CDE-86A3-4769-952F-E0821BF79493}.Release|x86.ActiveCfg = Release|Any CPU
{D62E2F92-A930-44D9-90FB-864CAF837BAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D62E2F92-A930-44D9-90FB-864CAF837BAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D62E2F92-A930-44D9-90FB-864CAF837BAE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{D62E2F92-A930-44D9-90FB-864CAF837BAE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{D62E2F92-A930-44D9-90FB-864CAF837BAE}.Debug|x64.ActiveCfg = Debug|Any CPU
{D62E2F92-A930-44D9-90FB-864CAF837BAE}.Debug|x86.ActiveCfg = Debug|Any CPU
{D62E2F92-A930-44D9-90FB-864CAF837BAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D62E2F92-A930-44D9-90FB-864CAF837BAE}.Release|Any CPU.Build.0 = Release|Any CPU
{D62E2F92-A930-44D9-90FB-864CAF837BAE}.Release|Mixed Platforms.ActiveCfg = Release|x64
{D62E2F92-A930-44D9-90FB-864CAF837BAE}.Release|Mixed Platforms.Build.0 = Release|x64
{D62E2F92-A930-44D9-90FB-864CAF837BAE}.Release|x64.ActiveCfg = Release|Any CPU
{D62E2F92-A930-44D9-90FB-864CAF837BAE}.Release|x86.ActiveCfg = Release|Any CPU
{D7B6AB15-5986-4FDC-ADA8-9EF14DF8F26D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D7B6AB15-5986-4FDC-ADA8-9EF14DF8F26D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D7B6AB15-5986-4FDC-ADA8-9EF14DF8F26D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
Expand All @@ -67,20 +45,69 @@ Global
{D7B6AB15-5986-4FDC-ADA8-9EF14DF8F26D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{D7B6AB15-5986-4FDC-ADA8-9EF14DF8F26D}.Release|x64.ActiveCfg = Release|Any CPU
{D7B6AB15-5986-4FDC-ADA8-9EF14DF8F26D}.Release|x86.ActiveCfg = Release|Any CPU
{D62E2F92-A930-44D9-90FB-864CAF837BAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D62E2F92-A930-44D9-90FB-864CAF837BAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D62E2F92-A930-44D9-90FB-864CAF837BAE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{D62E2F92-A930-44D9-90FB-864CAF837BAE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{D62E2F92-A930-44D9-90FB-864CAF837BAE}.Debug|x64.ActiveCfg = Debug|Any CPU
{D62E2F92-A930-44D9-90FB-864CAF837BAE}.Debug|x86.ActiveCfg = Debug|Any CPU
{D62E2F92-A930-44D9-90FB-864CAF837BAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D62E2F92-A930-44D9-90FB-864CAF837BAE}.Release|Any CPU.Build.0 = Release|Any CPU
{D62E2F92-A930-44D9-90FB-864CAF837BAE}.Release|Mixed Platforms.ActiveCfg = Release|x64
{D62E2F92-A930-44D9-90FB-864CAF837BAE}.Release|Mixed Platforms.Build.0 = Release|x64
{D62E2F92-A930-44D9-90FB-864CAF837BAE}.Release|x64.ActiveCfg = Release|Any CPU
{D62E2F92-A930-44D9-90FB-864CAF837BAE}.Release|x86.ActiveCfg = Release|Any CPU
{45486CDE-86A3-4769-952F-E0821BF79493}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{45486CDE-86A3-4769-952F-E0821BF79493}.Debug|Any CPU.Build.0 = Debug|Any CPU
{45486CDE-86A3-4769-952F-E0821BF79493}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{45486CDE-86A3-4769-952F-E0821BF79493}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{45486CDE-86A3-4769-952F-E0821BF79493}.Debug|x64.ActiveCfg = Debug|Any CPU
{45486CDE-86A3-4769-952F-E0821BF79493}.Debug|x86.ActiveCfg = Debug|Any CPU
{45486CDE-86A3-4769-952F-E0821BF79493}.Release|Any CPU.ActiveCfg = Release|Any CPU
{45486CDE-86A3-4769-952F-E0821BF79493}.Release|Any CPU.Build.0 = Release|Any CPU
{45486CDE-86A3-4769-952F-E0821BF79493}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{45486CDE-86A3-4769-952F-E0821BF79493}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{45486CDE-86A3-4769-952F-E0821BF79493}.Release|x64.ActiveCfg = Release|Any CPU
{45486CDE-86A3-4769-952F-E0821BF79493}.Release|x86.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{45486CDE-86A3-4769-952F-E0821BF79493} = {8C9C334C-588E-41A1-85FC-9DC035821D27}
{24B00C6C-88BE-4F83-B2E1-8CC8F145BFB9} = {32470B4C-0665-44B9-9A55-AF9C671FDAA5}
{A8BCA98B-12E7-4E13-99FE-09DDCA10BB26} = {32470B4C-0665-44B9-9A55-AF9C671FDAA5}
{D629207E-B540-40F6-B2B4-5BCDD033EAD6} = {24B00C6C-88BE-4F83-B2E1-8CC8F145BFB9}
{D7B6AB15-5986-4FDC-ADA8-9EF14DF8F26D} = {D629207E-B540-40F6-B2B4-5BCDD033EAD6}
{A8BCA98B-12E7-4E13-99FE-09DDCA10BB26} = {32470B4C-0665-44B9-9A55-AF9C671FDAA5}
{DEF8E4AE-D1A2-4C33-A4EC-A51BDF6BD09F} = {A8BCA98B-12E7-4E13-99FE-09DDCA10BB26}
{D62E2F92-A930-44D9-90FB-864CAF837BAE} = {DEF8E4AE-D1A2-4C33-A4EC-A51BDF6BD09F}
{D7B6AB15-5986-4FDC-ADA8-9EF14DF8F26D} = {D629207E-B540-40F6-B2B4-5BCDD033EAD6}
{45486CDE-86A3-4769-952F-E0821BF79493} = {8C9C334C-588E-41A1-85FC-9DC035821D27}
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = Server.csproj
StartupItem = test\Unit\Alchemy\AlchemyUnitTest.csproj
Policies = $0
$0.TextStylePolicy = $6
$1.inheritsSet = null
$1.scope = text/x-csharp
$0.CSharpFormattingPolicy = $2
$2.ElseIfNewLinePlacement = SameLine
$2.AfterDelegateDeclarationParameterComma = True
$2.inheritsSet = Mono
$2.inheritsScope = text/x-csharp
$2.scope = text/x-csharp
$3.FileWidth = 120
$3.NoTabsAfterNonTabs = True
$3.inheritsSet = VisualStudio
$3.inheritsScope = text/plain
$3.scope = text/plain
$4.inheritsSet = null
$4.scope = application/config+xml
$0.XmlFormattingPolicy = $7
$5.inheritsSet = null
$5.scope = application/config+xml
$6.inheritsSet = null
$6.scope = application/xml
$7.inheritsSet = Mono
$7.inheritsScope = application/xml
$7.scope = application/xml
EndGlobalSection
EndGlobal
5 changes: 0 additions & 5 deletions Alchemy.sln.DotSettings.user
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions packages/NUnit.2.5.10.11092/tools/nunit.exe.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
<!-- <add key="helpUrl" value="http://www.nunit.org" /> -->
</appSettings>

<startup>
<requiredRuntime version="v4.0.30319" />
</startup>

<runtime>
<!-- We need this so test exceptions don't crash NUnit -->
<legacyUnhandledExceptionPolicy enabled="1" />
Expand Down
Loading