first WebSocket test

Azure · Sep 11, 2012 · c63e3c7 · c63e3c7
1 parent 488a3b7
commit c63e3c7
Show file tree

Hide file tree

Showing 35 changed files with 2,330 additions and 3 deletions.
diff --git a/src/iisnode/cnodehttpstoredcontext.cpp b/src/iisnode/cnodehttpstoredcontext.cpp
@@ -97,6 +97,10 @@ HANDLE CNodeHttpStoredContext::GetPipe()
 void CNodeHttpStoredContext::SetPipe(HANDLE pipe)
 {
 	this->pipe = pipe;
+	if (NULL != this->upgradeContext)
+	{
+		this->upgradeContext->SetPipe(pipe);
+	}
 }
 
 DWORD CNodeHttpStoredContext::GetConnectionRetryCount()

diff --git a/src/iisnode/iisnode.vcxproj b/src/iisnode/iisnode.vcxproj
@@ -264,6 +264,7 @@ copy /y $(ProjectDir)\..\config\* $(ProjectDir)\..\..\build\$(Configuration)\$(P
     <None Include="..\..\test\functional\tests\124_node_config_override.js" />
     <None Include="..\..\test\functional\tests\125_node_config_autoupdate.js" />
     <None Include="..\..\test\functional\tests\126_node_config_syntax.js" />
+    <None Include="..\..\test\functional\tests\130_websocket_onetwothree.js" />
     <None Include="..\..\test\functional\tests\200_samples.bat" />
     <None Include="..\..\test\functional\tests\node_modules\iisnodeassert.js" />
     <None Include="..\..\test\functional\tests\parts\106_autoupdate_first.js" />
@@ -332,6 +333,8 @@ copy /y $(ProjectDir)\..\config\* $(ProjectDir)\..\..\build\$(Configuration)\$(P
     <None Include="..\..\test\functional\www\126_node_config_syntax\.gitignore" />
     <None Include="..\..\test\functional\www\126_node_config_syntax\hello.js" />
     <None Include="..\..\test\functional\www\126_node_config_syntax\web.config" />
+    <None Include="..\..\test\functional\www\130_websocket_onetwothree\server.js" />
+    <None Include="..\..\test\functional\www\130_websocket_onetwothree\web.config" />
     <None Include="..\..\test\performance\client.bat" />
     <None Include="..\..\test\performance\localRun.bat" />
     <None Include="..\..\test\performance\readme.txt" />

diff --git a/src/iisnode/iisnode.vcxproj.filters b/src/iisnode/iisnode.vcxproj.filters
@@ -147,6 +147,9 @@
     <Filter Include="Tests\functional\www\126_node_config_syntax">
       <UniqueIdentifier>{11747cf2-9384-4591-992e-4bc85c6fe7c8}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Tests\functional\www\130_websocket_onetwothree">
+      <UniqueIdentifier>{3ed37931-60f3-4898-98ac-01d5b0b19b07}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="main.cpp">
@@ -672,6 +675,15 @@
     <None Include="..\config\iisnode_dev_x86_on_x86.xml">
       <Filter>Config</Filter>
     </None>
+    <None Include="..\..\test\functional\www\130_websocket_onetwothree\server.js">
+      <Filter>Tests\functional\www\130_websocket_onetwothree</Filter>
+    </None>
+    <None Include="..\..\test\functional\www\130_websocket_onetwothree\web.config">
+      <Filter>Tests\functional\www\130_websocket_onetwothree</Filter>
+    </None>
+    <None Include="..\..\test\functional\tests\130_websocket_onetwothree.js">
+      <Filter>Tests\functional\tests</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="iisnode.rc" />

diff --git a/test/functional/node_modules/faye-websocket/CHANGELOG.txt b/test/functional/node_modules/faye-websocket/CHANGELOG.txt
diff --git a/test/functional/node_modules/faye-websocket/README.markdown b/test/functional/node_modules/faye-websocket/README.markdown